修复已知问题

src/hjm/query.tsx

@@ -16,7 +16,8 @@ import {
 import {Scan} from '@nutui/icons-react-taro'
 import {pageDictData} from "@/api/system/dict-data";
 import {DictData} from "@/api/system/dict-data/model";
-import {TenantId} from "@/utils/config";
+import {myUserVerify} from "@/api/system/userVerify";
+import {uploadFile} from "@/api/system/file";
 
 /**
  * 文章终极列表
@@ -25,9 +26,8 @@ import {TenantId} from "@/utils/config";
 const Query = () => {
   const {params} = useRouter();
   const [keywords, setKeywords] = useState<string>()
-  const [item, setItem] = useState<HjmCar>()
   const [dict, setDict] = useState<DictData[]>([])
-
+  const [adminId, setAdminId] = useState<number>()
   const [FormData, setFormData] = useState<HjmCar>(
     {
       // 自增ID
@@ -54,6 +54,10 @@ const Query = () => {
       insuranceStatus: undefined,
       // GPS设备编号
       gpsNo: undefined,
+      // 电子围栏ID
+      fenceId: undefined,
+      // 电子围栏名称
+      fenceName: undefined,
       // 电子围栏
       fence: undefined,
       // 位置
@@ -85,14 +89,16 @@ const Query = () => {
 
   // 提交表单
   const submitSucceed = (values: any) => {
-    updateHjmCar({...values, ...FormData, status: 1}).then(() => {
-      Taro.showToast({title: `保存成功`, icon: 'success'})
+    console.log(values)
+    updateHjmCar({...FormData, status: 1, driverId: adminId}).then(() => {
+      Taro.showToast({title: `绑定成功`, icon: 'success'})
       setTimeout(() => {
+        reload();
         return Taro.navigateBack()
       }, 1000)
     }).catch(() => {
       Taro.showToast({
-        title: '保存失败',
+        title: '绑定失败',
         icon: 'error'
       });
     })
@@ -131,50 +137,12 @@ const Query = () => {
 
   // 拍照上传功能
   const takePhoto = () => {
-    Taro.chooseImage({
-      count: 1,
-      sizeType: ['compressed'],
-      sourceType: ['camera'], // 只允许拍照
-      success: async (res) => {
-        const tempFilePath = res.tempFilePaths[0];
-        console.log(tempFilePath, 'tempFilePath')
-        // 上传图片到OSS
-        Taro.uploadFile({
-          url: 'https://server.gxwebsoft.com/api/oss/upload',
-          filePath: tempFilePath,
-          name: 'file',
-          header: {
-            'content-type': 'application/json',
-            TenantId
-          },
-          success: (res) => {
-            const data = JSON.parse(res.data);
-            if (data && data.code === 0) {
-              console.log(data.data.url, '1url.....')
-              updateHjmCar({
-                id: FormData.id,
-                image: data.data.downloadUrl + '?x-oss-process=image/resize,w_750/quality,Q_90'
-              }).then(() => {
-                Taro.showToast({
-                  title: '上传成功',
-                  icon: 'success',
-                  duration: 2000
-                });
-                setFormData({...FormData,image: data.data.downloadUrl + '?x-oss-process=image/resize,w_750/quality,Q_90'})
-              })
-            }
-          }
-        })
-      },
-      fail: (err) => {
-        console.log('拍照失败', err);
-        Taro.showToast({
-          title: '拍照失败',
-          icon: 'error',
-          duration: 2000
-        });
-      }
-    });
+    uploadFile().then(res => {
+      setFormData({
+        ...FormData,
+        image: res.url
+      })
+    })
   }
 
   // 删除图片
@@ -205,39 +173,50 @@ const Query = () => {
     pageDictData({dictCode: 'InsuranceStatus'}).then(res => {
       setDict(res?.list || [])
     })
+    // 检查是否已实名
+    myUserVerify({status: 1}).then(data => {
+      if (!data) {
+        Taro.showToast({
+          title: '未实名认证',
+          icon: 'error'
+        })
+        setTimeout(() => {
+          Taro.navigateTo({
+            url: '/user/userVerify/index'
+          })
+        }, 1000)
+        return false
+      }
+      if(data){
+        setAdminId(data.userId);
+      }
+    })
+    // 获取车辆信息
+    if (id) {
+      getHjmCar(id).then(data => {
+        if(data){
+          setFormData(data)
+          setKeywords(data.code)
+          if (data.status == 0) {
+            Taro.setNavigationBarTitle({
+              title: '安装设备'
+            })
+            setFormData({...data, driver: Taro.getStorageSync('RealName')})
+          }
+        }
+      })
+    }
     // 执行搜索
     if (keywords) {
       pageHjmCar({keywords}).then(res => {
         if (res?.list && res?.list?.length > 0) {
           const data = res?.list[0];
-          setItem(data)
+          // setFormData(data)
           setKeywords(data.code)
         }
       })
       return false;
     }
-    // 获取车辆信息
-    if (id) {
-      getHjmCar(id).then(data => {
-        setItem(data)
-        setKeywords(data.code)
-        setFormData(data)
-
-        // 初始化已上传的图片
-        // if (data.image) {
-        // const images = data.image.split(',').filter(img => img.trim());
-        // setUploadedImages(images);
-        // }
-
-        console.log(data.status, '1213')
-        if (data.status == 0) {
-          Taro.setNavigationBarTitle({
-            title: '安装设备'
-          })
-          setFormData({...data, driver: Taro.getStorageSync('RealName')})
-        }
-      })
-    }
   }
 
   useEffect(() => {
@@ -247,9 +226,8 @@ const Query = () => {
 
   return (
     <>
-
       {/* 未安装 */}
-      {item?.status == 0 ? (
+      {FormData?.status == 0 ? (
         <div className={'car-info w-full bg-white'}>
           <div className={'px-0'}>
             <Form
@@ -277,7 +255,7 @@ const Query = () => {
                 name="code"
                 rules={[{message: '请输入车辆编号'}]}
               >
-                <View onClick={() => copyText(`${item?.code}`)}>{item?.code}</View>
+                <View onClick={() => copyText(`${FormData?.code}`)}>{FormData?.code}</View>
               </Form.Item>
               <Form.Item
                 label={'快递公司品牌'}
@@ -320,6 +298,7 @@ const Query = () => {
               <Form.Item
                 label={'GPS编号'}
                 name="gpsNo"
+                required
                 rules={[{message: 'GPS编号'}]}
               >
                 <div
@@ -345,6 +324,7 @@ const Query = () => {
               <Form.Item
                 label={'拍照上传'}
                 name="image"
+                required
                 rules={[{message: '请上传照片'}]}
                 onClick={takePhoto}
               >
@@ -353,6 +333,7 @@ const Query = () => {
                          radius="10%" width="80" height="80"/>
                 </div>
               </Form.Item>
+
               <Form.Item
                 label={'操作员'}
                 name="driver"
@@ -366,33 +347,42 @@ const Query = () => {
       ) : ''}
 
       {/* 已安装 */}
-      {item?.status == 1 ? (
+      {FormData?.status == 1 ? (
         <div className={'car-info w-full bg-white'}>
-          <Image src={item?.image} mode={'aspectFit'} width={'100%'} height={'300px'}/>
+          <Image src={FormData?.image} mode={'aspectFit'} width={'100%'} height={'300px'}/>
           <div className={'px-2'}>
-            <Cell className={'car-info-item-title'} onClick={() => copyText(`${item?.code}`)}>
-              车辆编号：{item?.code}
+            <Cell className={'car-info-item-title'} onClick={() => copyText(`${FormData?.code}`)}>
+              车辆编号：{FormData?.code}
             </Cell>
             <Cell className={'car-info-item-title'}>
-              快递公司品牌：{item?.parentOrganization}
+              快递公司品牌：{FormData?.parentOrganization}
             </Cell>
             <Cell className={'car-info-item-title'}>
-              管理责任人：{item?.parentOrganizationAdmin}
+              管理责任人：{FormData?.parentOrganizationAdmin}
             </Cell>
             <Cell className={'car-info-item-content'}>
-              操作员：{item?.driver}
+              操作员：{FormData?.driver}
             </Cell>
             <Cell className={'car-info-item-content'}>
-              保险状态：{item?.insuranceStatus}
+              保险状态：{FormData?.insuranceStatus}
             </Cell>
             <Cell className={'car-info-item-content'}>
-              GPS编号：{item?.gpsNo}
+              GPS编号：{FormData?.gpsNo}
             </Cell>
             <Cell className={'car-info-item-content'}>
-              电子围栏：{item?.fence}
+              电子围栏：{FormData?.fenceName}
             </Cell>
+            <Button nativeType="submit" block type="info" onClick={
+              () => {
+                Taro.navigateTo({
+                  url: `/hjm/location?id=${FormData?.id}`
+                })
+              }
+            }>
+              查看定位
+            </Button>
             {/*<Cell className={'car-info-item-content'}>*/}
-            {/*  状态：{item?.status == 1 ? '已安装' : '未安装'}*/}
+            {/*  状态：{FormData?.status == 1 ? '已安装' : '未安装'}*/}
             {/*</Cell>*/}
           </div>
         </div>