Browse Source

优化测量详情

feature/rail
LiLongLong 5 months ago
parent
commit
086a7c3481
  1. 2
      .env
  2. 2
      package.json
  3. 9
      src/components/Header.tsx
  4. 3
      src/pages/measure/components/MeasureDetail.tsx

2
.env

@ -1 +1 @@
REACT_APP_WS_URL=192.168.1.201/ws
REACT_APP_WS_URL=localhost:3005

2
package.json

@ -2,7 +2,7 @@
"name": "outline",
"version": "0.1.0",
"private": true,
"proxy":"http://localhost:3001",
"proxy":"http://localhost:3005",
"dependencies": {
"@babel/core": "^7.16.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",

9
src/components/Header.tsx

@ -6,7 +6,7 @@ import icon_logout from "../assets/icon_logout.svg";
import check_mark from "../assets/check_mark.svg";
import icon_pwd from "../assets/icon_pwd.svg";
import { useState } from "react";
import { bluetoothList, bluetoothInfo } from '../mock/recordList'
// import { bluetoothList, bluetoothInfo } from '../mock/recordList'
import { Dropdown, MenuProps, message, Button, Popover } from "antd";
import { logout } from "../services/user/user";
import "./bluetooth.scss";
@ -55,13 +55,14 @@ export default function Header() {
},
];
let [bluetoothList, setbluetoothList] = useState([])
const getBtList = () => {
let Dom = null
if(isConnect === 0){
Dom = <div>
{bluetoothList.map(item => {
return <div className="mt-[1rem]" onClick={connectBt}>
<Button type="link">{item.name}</Button>
{/* <Button type="link">{item.name}</Button> */}
</div>
})}
</div>
@ -82,8 +83,8 @@ export default function Header() {
<div className="ml-[10px]"></div>
</div>
<div className="pl-[15px]">
<div className="mt-[1rem]">{bluetoothInfo.type}</div>
<div className="mt-[1rem]">{bluetoothInfo.power}</div>
{/* <div className="mt-[1rem]">{bluetoothInfo.type}</div>
<div className="mt-[1rem]">{bluetoothInfo.power}</div> */}
</div>
</div>
</div>

3
src/pages/measure/components/MeasureDetail.tsx

@ -9,7 +9,6 @@ import { useNavigate } from 'react-router-dom';
import type { DetailTable } from "../../../services/measure/type";
import { ExclamationCircleFilled } from '@ant-design/icons';
import { detailList } from '../../../mock/recordList'
export default function MeasureDetail() {
// 通过useSelector直接拿到store中定义的value
//@ts-ignore
@ -73,7 +72,7 @@ export default function MeasureDetail() {
setTableData(res.data.list)
}).catch(e=>{
//如果接口异常,则使用mock数据
setTableData(detailList)
// setTableData(detailList)
})
}

Loading…
Cancel
Save