Merge branch 'master' of http://192.168.1.3:3000/zhangjiming/Outline

src/pages/measure/components/MeasureDetail.tsx

@@ -144,19 +144,19 @@ export default function MeasureDetail() {
 		setIsModaUploadlOpen(true)
 	}
 
-	const onDownloadData = async () =>{
-		setIdList([])
-		let list = [...selectRows]
-		let Ids:number[] = []
-		list.map(item => {
-			Ids.push(item.id)
-		})
-		setIdList(Ids)
-		const response = await fetch(`/api/measurement-task/downloads/${Ids.join(',')}`);
-		const blob = await response.blob(); // 先获取 Blob
-		const arrayBuffer = await blob.arrayBuffer(); // 将 Blob 转换为 ArrayBuffer
-		exportFile(arrayBuffer, `坐标数据.xls`); // 传递 ArrayBuffer 给函数
-	}
+	const onDownloadData = async () => {
+		// 1. 准备 id 列表
+		const Ids = selectRows.map(r => r.id);
+		// 2. 发起请求
+		const response = await fetch(`/api/measurement-data/downloads-zip/${Ids.join(',')}`);
+		// 3. 拿到 Blob
+		const blob = await response.blob();
+		// 4. 解析后端文件名
+		const contentDisp = response.headers.get('content-disposition');
+		const filename = parseFilename(contentDisp) || 'download.zip';
+		// 5. 触发下载
+		exportFile(blob, filename);
+	};
 
 
 	const [percent, setPercent] = useState(0)
@@ -233,14 +233,30 @@ export default function MeasureDetail() {
 		getMeasurePoints(item)
 	}
 
-	//导出
-	const onDownloadRecord = async(item:DetailTable) => {
-		const response = await fetch(`/api/measurement-task/download/${item.id}`); 
-    const blob = await response.blob(); // 先获取 Blob
-    const arrayBuffer = await blob.arrayBuffer(); // 将 Blob 转换为 ArrayBuffer
-    exportFile(arrayBuffer, `${item.name}.txt`); // 传递 ArrayBuffer 给函数
+	function parseFilename(disposition: string | null): string | null {
+		if (!disposition) return null;
+		// 匹配 filename*=UTF-8''xxx 或 filename=xxx（带不带引号都能捕获）
+		const match = disposition.match(/filename\*?=(?:UTF-8'')?["']?([^"';]+)["']?/i);
+		return match ? decodeURIComponent(match[1]) : null;
 	}
 
+	//导出
+	const onDownloadRecord = async (item: DetailTable) => {
+		// 1. 发请求
+		const response = await fetch(`/api/measurement-data/download/${item.id}`);
+
+		// 2. 拿到 Blob
+		const blob = await response.blob();
+
+		// 3. 解析头里的文件名
+		const contentDisp = response.headers.get('content-disposition');
+		// fallback 到 item.name + .txt
+		const filename = parseFilename(contentDisp) || `${item.name}.txt`;
+
+		// 4. 触发下载
+		exportFile(blob, filename);
+	};
+
 	const getMeasurePoints = (recordItem:DetailTable) => {
 		getPointsById({id:recordItem.id}).then(res=>{
 			if (canvasRef.current) {

src/pages/system/Setting.tsx

@@ -326,9 +326,9 @@ export default function Setting(){
     >
       {
         systemList.map((item, index) => {
-          return item.name ? 
+          return item.name ?
             <Form.Item
-              
+
               key={index}
               label={item.name}
               name={item.code}
@@ -338,7 +338,7 @@ export default function Setting(){
                 : <Input defaultValue={item.value} onBlur={(e) => saveSet(item, e.target.value)}/>}
           </Form.Item>
           : null
-        }) 
+        })
       }
       <Form.Item
           label='名称加序号'
@@ -346,6 +346,13 @@ export default function Setting(){
       >
         <Switch defaultChecked onChange={onTodayNumberFlagChange} />
       </Form.Item>
+
+      <Form.Item label="导出文件格式" name="downloadFileType" initialValue="txt">
+        <Select style={{ width: 120 }} onChange={onDownloadFileTypeChange} >
+          <Select.Option value="txt">txt</Select.Option>
+          <Select.Option value="ban">ban</Select.Option>
+        </Select>
+      </Form.Item>
     </Form>
   }
 
@@ -367,6 +374,18 @@ export default function Setting(){
     })
   }
 
+  const onDownloadFileTypeChange = (value: string) => {
+    const params: StandbyMinutes = {
+      downloadFileType: value,
+    }
+    saveDeviceConfig(params).then(res=> {
+      message.success("保存成功");
+      setSaveLoading(false)
+    }).catch(e => {
+      setSaveLoading(false)
+    })
+  }
+
   const onTodayNumberFlagChange = (value: boolean) => {
     const params: StandbyMinutes = {
       todayNumberFlag: value,

src/services/measure/type.ts

@@ -132,4 +132,5 @@ export type trackItem = {
 export type StandbyMinutes = {
   standbyMinutes?: string | number
   todayNumberFlag?: boolean
+  downloadFileType?: string
 }

src/utils/index.ts

@@ -87,18 +87,13 @@ export function findSymmetricPoint(px: number, py: number, ox = 0, oy = 0) {
 }
 
 
-export function exportFile(response: ArrayBuffer, fileName: string){
-    // 创建 Blob 对象
-    const blob = new Blob([response], { type: 'application/octet-stream' });
-    // 创建一个 URL 对象，将 Blob 对象转换为 URL
-    const url = window.URL.createObjectURL(blob);
-    const a = document.createElement('a');
-    a.href = url;
-    a.download = fileName;
-    // 模拟点击 <a> 元素来触发下载
-    a.click();
-    // 释放 URL 对象
-    window.URL.revokeObjectURL(url);
+export function exportFile(blob: Blob, fileName: string) {
+	const url = window.URL.createObjectURL(blob);
+	const a = document.createElement('a');
+	a.href = url;
+	a.download = fileName;
+	a.click();
+	window.URL.revokeObjectURL(url);
 }
 
 export function padNumber(num: number, length: number) {