feats

src/app.config.js

@@ -21,7 +21,6 @@ export default defineAppConfig({
     'pages/reset-password/index',
     'pages/check/list/index',
     'pages/check/loc/list/index',
-    'pages/check/loc/edit/index',
     'pages/check/edit/index',
   ],
   window: {

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,252 +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(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>
-    </>
-  )
-}
+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/index.jsx

@@ -16,6 +16,10 @@ export default (props) => {
       Taro.navigateTo({
         url: `/pages/check/loc/list/index?checkId=${item.checkId}`
       })
+    } else {
+      Taro.navigateTo({
+        url: `/pages/check/edit/index?checkId=${item.checkId}&typ=${typ}`
+      })
     }
   }
 

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

@@ -1,10 +1,11 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
-import { Cell, Icon } from '@antmjs/vantui';
+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) => {
 
@@ -22,24 +23,26 @@ export default (props) => {
 
   const onClick = (item) => {
     Taro.navigateTo({
-      url: `/pages/check/loc/edit/index?id=${item.itemId}`
+      url: `/pages/check/edit/index?id=${item.itemId}&typ=${item.itemType}`
     })
   }
   
   return (
-    <Page loading={loading}>
+    <Page loading={loading} roles={[ROLE_INSPECTOR]}>
       <PowerList
         request={getTaCheckItem}
         params={params}
         renderItem={item => (
           <Cell
+            isLink
             key={item.itemId}
             title={item.name}
-            renderRightIcon={(
-              <Icon name={item.readonly ? 'link-o' : 'arrow'} />
-            )}
             onClick={() => onClick(item)}
-          />
+          >
+            {
+              item.readonly ? <Tag color="var(--main-bg-color)">已答完</Tag> : null
+            }
+          </Cell>
         )}
         onLoadingChange={setLoading}
       />

src/services/tacheckitem.js

@@ -38,4 +38,9 @@ export const getTaCheckItemAnswer = (id) => request(`/api/taCheckItem/${id}/answ
 /*
  * 获取当前答案
  */
-export const putTaCheckItemAnswer = (id, data) => request(`/api/taCheckItem/${id}/answer`, { method: 'put', data });
+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}`);