From d1b233354e39e21f205fa51329b3d851e94e8041 Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Wed, 9 Apr 2025 23:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=B1=E8=B4=A5=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MeasureItem.tsx |  4 ++--
 src/pages/MeasureSave.tsx      | 42 ++++++++++++++++++++++--------------------
 src/pages/UploadList.tsx       |  1 +
 src/services/apiTypes.ts       |  1 +
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/components/MeasureItem.tsx b/src/components/MeasureItem.tsx
index 1569f5d..142be71 100644
--- a/src/components/MeasureItem.tsx
+++ b/src/components/MeasureItem.tsx
@@ -6,7 +6,6 @@ import icon_uploading from '../assets/icon_upload_1.svg';
 import icon_uploaded from '../assets/icon_upload_2.svg';
 import { Measurement } from '../services/apiTypes';
 
-
 export type UpdateState = 'idle' | 'pending' | 'uploading' | 'uploaded';
 
 export default function MeasureItem({
@@ -41,6 +40,7 @@ export default function MeasureItem({
         </main>
         <footer>
           <span className="text-sm text-[#b7b7b7]">{item.createTime}</span>
+          {item.syncStatus === 'fail' && item.errorMsg && <p className='text-xs text-[red] whitespace-pre-wrap'>{item.errorMsg}</p>}
         </footer>
       </main>
       <aside className="flex items-center" onClick={onDetail}>
@@ -95,7 +95,7 @@ export function MeasureItemEx(props: {
           <h1 className="text-[15px] font-medium ">{props.item.name}</h1>
         </header>
         <main className="flex my-2">
-        <p className="flex-1 text-sm ">{props.item.extraDescObj?.gwdCode}</p>
+          <p className="flex-1 text-sm ">{props.item.extraDescObj?.gwdCode}</p>
           <p className="flex-1 text-sm ">{props.item.extraDescObj?.xmCode}</p>
           <p className="flex-1 text-sm ">{props.item.extraDescObj?.xbCode}</p>
         </main>
diff --git a/src/pages/MeasureSave.tsx b/src/pages/MeasureSave.tsx
index b5395a2..ec5ce37 100644
--- a/src/pages/MeasureSave.tsx
+++ b/src/pages/MeasureSave.tsx
@@ -144,25 +144,6 @@ export default function MeasureSave() {
                 onChange={onInputChange}
               />
             </div>
-            <div className="h-12 flex items-center border-b border-[#eee]">
-              <span>里程</span>
-              <input
-                type="number"
-                name="mile"
-                value={mile}
-                className="w-14 h-8 mx-1 border border-[#eee] rounded outline-none text-center ml-auto"
-                onChange={onInputChange}
-              />
-              <span>公里+</span>
-              <input
-                type="number"
-                name="meter"
-                value={meter}
-                className="w-14 h-8 mx-1 border border-[#eee] rounded outline-none text-center"
-                onChange={onInputChange}
-              />
-              <span>米</span>
-            </div>
             <div
               className="h-12 flex items-center border-b border-[#eee]"
               onClick={() => setDataSourcePickerVisible(true)}
@@ -173,7 +154,8 @@ export default function MeasureSave() {
               </span>
               <img src={icon_arr_r} alt="arr" />
             </div>
-            {dataSourceCode[0] === 'DCDC' && (
+
+            {dataSourceCode[0] === 'DCDC' ? (
               <>
                 <div className="h-12 flex items-center border-b border-[#eee]">
                   <span>道岔号</span>
@@ -196,6 +178,26 @@ export default function MeasureSave() {
                   />
                 </div>
               </>
+            ) : (
+              <div className="h-12 flex items-center border-b border-[#eee]">
+                <span>里程</span>
+                <input
+                  type="number"
+                  name="mile"
+                  value={mile}
+                  className="w-14 h-8 mx-1 border border-[#eee] rounded outline-none text-center ml-auto"
+                  onChange={onInputChange}
+                />
+                <span>公里+</span>
+                <input
+                  type="number"
+                  name="meter"
+                  value={meter}
+                  className="w-14 h-8 mx-1 border border-[#eee] rounded outline-none text-center"
+                  onChange={onInputChange}
+                />
+                <span>米</span>
+              </div>
             )}
             <div
               className="h-12 flex items-center border-b border-[#eee]"
diff --git a/src/pages/UploadList.tsx b/src/pages/UploadList.tsx
index 794a5e3..056d077 100644
--- a/src/pages/UploadList.tsx
+++ b/src/pages/UploadList.tsx
@@ -107,6 +107,7 @@ export default function UploadList() {
   useEffect(() => {
     const subscription = bridgeOb.subscribe((datagram) => {
       if (datagram.type === 'sync-item-finish') {
+        console.log(datagram);
         const item = list.find((item) => item.id === datagram.data.id);
         if (item) {
           item.syncStatus = datagram.data.success ? 'finish' : 'fail';
diff --git a/src/services/apiTypes.ts b/src/services/apiTypes.ts
index 191518d..73c0684 100644
--- a/src/services/apiTypes.ts
+++ b/src/services/apiTypes.ts
@@ -54,6 +54,7 @@ export type MeasurementDTO = {
   unitType: string; // 股别
   radius: string;
   extraDesc: string; // 额外描述
+  errorMsg?: string;
 };
 
 export type ExtraDesc = {