优化保存测量数据

src/components/Header.tsx

@@ -22,7 +22,9 @@ export default function Header() {
 	// const deviceState = useAppSelector(store => store.context.device);
 	const userInfo = useAppSelector(store => store.context.user.loginUser);
 	const [power, setPower] = useState(deviceInfo.power.toFixed())//deviceInfo.power.toFixed()
-	const [powerColor, setPowerColor] = useState('bluetooth-battery')
+	const [powerStyle, setPowerStyle] = useState('bluetooth-battery')
+	const [powerColor, setPowerColor] = useState('#ffffff')
+	const [powerBackColor, setPowerBackColor] = useState('#ffffff')
 	//获取当前websocet的状态
 
 	const showBlueImg = () => {
@@ -64,17 +66,26 @@ export default function Header() {
 	}, [userInfo.nickname, userInfo.account]);
 
 	useEffect(() => {
-		if(deviceInfo.power > 20){
-			setPowerColor('bluetooth-battery')
+		let power = deviceInfo.power
+		let flag = deviceInfo.flag
+		if(power > 20){
+			setPowerStyle('bluetooth-battery')
+			setPowerColor('#ffffff')
+			setPowerBackColor('#3e63cb')
 		}
-		if(deviceInfo.power <= 20){
-			setPowerColor('bluetooth-battery-red')
+		if(power <= 20){
+			setPowerStyle('bluetooth-battery-red')
+			setPowerColor('#red')
+			setPowerBackColor('red')
 		}
-		if(deviceInfo.flag === 1){
-			setPowerColor('bluetooth-battery-green')
+		if(flag === 1){
+			setPowerStyle('bluetooth-battery-green')
+			setPowerColor('#ffffff')
+			setPowerBackColor('#52c41a')
+			
 		}
-		setPower(deviceInfo.power.toFixed())
-	}, [deviceInfo.power])
+		setPower(power.toFixed())
+	}, [deviceInfo.power, deviceInfo.flag])
 
 	//同步科天健基础数据
 	const onSyncKTJData = () => {
@@ -158,9 +169,9 @@ export default function Header() {
 							<span className="w-[120px]">Y轴倾斜：{deviceInfo.inclinatorY}</span>
 						</section>
 						<section className="bg-white rounded-md h-9 w-12 relative  mr-3 flex justify-center items-center">
-							<div className={`${powerColor} flex justify-center items-center`}>
-								<div className="power-process text-center" style={{width: `${power}%`}}>
-									<div style={{"position": "relative","top": "-1.6rem"}}>{power}</div>
+							<div className={`${powerStyle} flex justify-center items-center`}>
+								<div className="power-process text-center" style={{width: `${power}%`, background: powerBackColor }}>
+									<div style={{"position": "relative","top": "-1.6rem", color: powerColor}}>{power}</div>
 								</div>
 								{(deviceInfo.flag === 0 && Number(power) < 100) && 
 									<div className="power-charging">

src/components/bluetooth.scss

@@ -29,15 +29,15 @@
     width: 2rem;
     padding-left: 2px;
     padding-right: 2px;
-    color: var(--primaryColor);
-    border: solid 1px var(--primaryColor);
+    color: #3e63cb;
+    border: solid 1px #3e63cb;
     border-radius: 2px;
     &::after {
         content: " ";
         position: absolute;
         width: 4px;
         height: 8px;
-        background-color: var(--primaryColor);
+        background-color: #3e63cb;
         right: -4px;
         top: 3px;
         border-top-right-radius: 2px;

src/pages/measure/components/MeasureAction.tsx

@@ -701,9 +701,9 @@ export default function MeasureAction() {
 								>
 								校准
 							</Button>
-							<Checkbox checked={afterSave} onChange={onAfterSaveChange}>
+							{/* <Checkbox checked={afterSave} onChange={onAfterSaveChange}>
 								保存后自动开始新测量
-							</Checkbox>
+							</Checkbox> */}
 						</section>
 					</div>
 				</div>

src/pages/measure/components/MeasureConfig.tsx

@@ -464,7 +464,8 @@ export default function MeasureConfig() {
                 }))}
               ></Select>
             </Form.Item>            
-            {stationList && <Form.Item
+            {dataSource === "DCDC" &&
+            <Form.Item
               label={resetLabel('车站')}
 							name="stationCode"
 							rules={[{ required: true, message: "请选择车站" }]}

src/pages/system/Setting.tsx

@@ -444,11 +444,11 @@ export default function Setting(){
       <section className='p-[20px]'>
         {form()}
       </section>
-      <h1 className='text-[20px]'>设备配置</h1>
+      <h1 className='text-[20px]'>蓝牙配置</h1>
       {connectionStatus()}
-      <h1 className='text-[20px]'>设置</h1>
+      <h1 className='text-[20px]'>设备设置</h1>
       <div className='p-[20px]'>
-        设置休眠时间：
+        休眠时间：
         <Select
           defaultValue={standbyMinutes}
           style={{ width: 120 }}