11

config/prod.js

@@ -3,11 +3,15 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
+<<<<<<< HEAD
     // HOST: '"http://192.168.89.25:9087"',
+=======
+    // HOST: '"http://192.168.89.147:9087"',
+>>>>>>> 5ab9f7c14c635202431490cc583c16a77f4f47a2
     HOST: '"https://wmcj.huoshannews.com"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
-    VERSION: '"1.1.22-20230413"',
+    VERSION: '"1.1.24-20230516"',
   },
   mini: {},
   h5: {

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

@@ -16,6 +16,11 @@ export default (props) => {
   }
 
   const setFieldChange = (key, val) => {
+    // console.log('--------answerItem----------->', answerItem);
+    // console.log('--------key----------->', key);
+    // console.log('--------val----------->', val);
+
+
     if (readonly) return;
 
     onChange({
@@ -38,7 +43,7 @@ export default (props) => {
   //     });
   //   }
   // }, [quInfo?.quId]);
-  
+  console.log('------------>h');
   return (
     <View>
       <RadioGroup value={answerItem?.answerCode}>
@@ -46,7 +51,7 @@ export default (props) => {
           <Cell
             border={false}
             renderTitle={(
-              <View style={{fontWeight: 'bold'}}>
+              <View style={{ fontWeight: 'bold' }}>
                 <Text>{quInfo?.sortNo}、</Text>
                 <Text>{quInfo?.title}</Text>
               </View>
@@ -66,7 +71,7 @@ export default (props) => {
             )
           }
           {
-            (quInfo?.answerList || []).map((it) => {              
+            (quInfo?.answerList || []).map((it) => {
               return (
                 <Cell
                   key={it.answerId}
@@ -84,7 +89,7 @@ export default (props) => {
       {
         checkType != 'survey' && (
           <>
-            <CellGroup style={{marginTop: '20px'}}>
+            <CellGroup style={{ marginTop: '20px' }}>
               <Cell title="测评标准" />
               <Cell
                 renderTitle={
@@ -92,15 +97,19 @@ export default (props) => {
                 }
               />
             </CellGroup>
-            <CellGroup style={{marginTop: '20px'}}>        
-              <Cell title="拍照或视频" border={false} />
-      
+            <CellGroup style={{ marginTop: '20px' }}>
+              <Cell renderTitle={
+                <><Text style={{ color: 'red' }}>* </Text> <Text>拍照或视频</Text></>
+              }
+                border={false}
+              />
+
               <Cell
                 renderTitle={
                   <Uploader
                     disabled={readonly}
                     value={answerItem?.attachList}
-                    onChange={e => setFieldChange('attachList',e)}
+                    onChange={e => setFieldChange('attachList', e)}
                   />
                 }
               />

src/pages/check/edit/index.jsx

@@ -106,7 +106,7 @@ export default (props) => {
     const finished = quList.filter(x => x.finished).length == quList.length;
     if (!answer || !answer.answerItemList || !finished) {
       Notify.show({
-        message: '请作答完成所有题目',
+        message: '请作答完成所有题目即照片',
         type: 'warning',
       })
       return;
@@ -193,6 +193,7 @@ export default (props) => {
     }
   }, [checkItemInfo]);
 
+  // console.log('--------------quList---------------->', quList);
   return (
     <Page loading={loading} roles={[ROLE_INSPECTOR]}>
       <VABC
@@ -222,7 +223,6 @@ export default (props) => {
           {
             quList.map((x, inx) => {
               const answerItem = answer?.answerItemList?.filter(y => y.quId == x.quId)[0];
-
               return (
                 index == inx && (
                   <Question

src/pages/check/list/index.jsx

@@ -8,13 +8,14 @@ import PowerList from '@/components/PowerList';
 import { getTaCheck } from '@/services/tacheck';
 import Card from './components/Card';
 
-const queryParams = {isValid: true};
+const queryParams = { isValid: true };
 const sid1 = Math.random().toString(36).substring(2, 8);
 
 export default (props) => {
 
   const onClick = (typ, item) => {
     if (typ == 'loc') {
+      console.log('------xiaofang----->');
       Taro.navigateTo({
         url: `/pages/check/loc/list/index?checkId=${item.checkId}`
       })

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

@@ -38,7 +38,8 @@ export default (props) => {
       });
     }
   }, [quInfo?.quId]);
-  
+
+  // console.log('----------------方方--quInfo------------>', quInfo);
   return (
     <View>
       <RadioGroup value={answerItem?.answerCode}>
@@ -46,8 +47,8 @@ export default (props) => {
           <Cell
             border={false}
             renderTitle={(
-              <View style={{fontWeight: 'bold'}}>
-                <Text>{quInfo?.sortNo}、</Text>
+              <View style={{ fontWeight: 'bold' }}>
+                <Text style={{ color: '#999' }}>{quInfo?.sortNo}、</Text>
                 <Text>{quInfo?.title}</Text>
               </View>
             )}
@@ -66,7 +67,7 @@ export default (props) => {
             )
           }
           {
-            (quInfo?.answerList || []).map((it) => {              
+            (quInfo?.answerList || []).map((it) => {
               return (
                 <Cell
                   key={it.answerId}
@@ -81,7 +82,7 @@ export default (props) => {
           }
         </CellGroup>
       </RadioGroup>
-      <CellGroup style={{marginTop: '20px'}}>
+      <CellGroup style={{ marginTop: '20px' }}>
         <Cell title="测评标准" />
         <Cell
           renderTitle={
@@ -89,7 +90,7 @@ export default (props) => {
           }
         />
       </CellGroup>
-      <CellGroup style={{marginTop: '20px'}}>        
+      <CellGroup style={{ marginTop: '20px' }}>
         <Cell title="拍照或视频" border={false} />
 
         <Cell
@@ -97,7 +98,7 @@ export default (props) => {
             <Uploader
               disabled={readonly}
               value={answerItem?.attachList}
-              onChange={e => setFieldChange('attachList',e)}
+              onChange={e => setFieldChange('attachList', e)}
             />
           }
         />

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

@@ -49,17 +49,17 @@ export default (props) => {
   const onAnswerItemChange = (answerItem, quInfo) => {
     if (!answerItem) return;
 
-    const an = {...(answer || {})}
+    const an = { ...(answer || {}) }
     const answerItemList = an.answerItemList || []
 
     if ((answerItem.answerCode || answerItem.answer) &&
       answerItem.attachList?.length) {
-        // 说明这一题已经回答完毕
-        quInfo.finished = true
-      } else {
-        quInfo.finished = false
-      }
-    
+      // 说明这一题已经回答完毕
+      quInfo.finished = true
+    } else {
+      quInfo.finished = false
+    }
+
     // 更新问题列表中是否作答的标志位
     setQuList(quList.map(x => x.quId == quInfo.quId ? quInfo : x));
 
@@ -104,8 +104,8 @@ export default (props) => {
       setLoading(false);
       const t = setTimeout(() => {
         clearTimeout(t);
-        Taro.navigateBack({delta: 1});
-      }, 1000);      
+        Taro.navigateBack({ delta: 1 });
+      }, 1000);
     }).catch(() => {
       setLoading(false);
     });
@@ -120,7 +120,7 @@ export default (props) => {
           type: 'warning',
         })
 
-        Taro.navigateBack({delta: 1})
+        Taro.navigateBack({ delta: 1 })
         return;
       }
 
@@ -136,12 +136,13 @@ export default (props) => {
       getTaCheckItemById(id).then(res => {
         setCheckItemInfo(res);
       });
-      
+
       // 查询我的答案
       getTaCheckItemAnswer(id).then(setAnswer);
-  
+
       // 查询当前测评主记录的所有问题
-      getTaCheckItemQu({pageSize: 200, itemId: id}).then(res => {
+      getTaCheckItemQu({ pageSize: 200, itemId: id }).then(res => {
+        console.log('---------->res------------->', res);
         setLoading(false);
         setQuList(res.records || []);
       }).catch(() => {
@@ -151,7 +152,8 @@ export default (props) => {
       setLoading(false);
     });
   }, [id]);
-  
+  // console.log('--------id---------->', id);
+  // console.log('--------方方--quList------>>>>>>>', quList);
   return (
     <Page loading={loading} roles={[ROLE_INSPECTOR]}>
       <VABC
@@ -165,41 +167,40 @@ export default (props) => {
           />
         )}
       >
-        <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 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>