Browse Source

显示失败原因

master
zhangjiming 4 months ago
parent
commit
d1b233354e
  1. 4
      src/components/MeasureItem.tsx
  2. 42
      src/pages/MeasureSave.tsx
  3. 1
      src/pages/UploadList.tsx
  4. 1
      src/services/apiTypes.ts

4
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>

42
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]"

1
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';

1
src/services/apiTypes.ts

@ -54,6 +54,7 @@ export type MeasurementDTO = {
unitType: string; // 股别
radius: string;
extraDesc: string; // 额外描述
errorMsg?: string;
};
export type ExtraDesc = {

Loading…
Cancel
Save