zhangjiming
/
Outline
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

feat_upload_server_url_0416
LiLongLong 4 months ago
parent
01fd739081
commit
7181a67430
10 changed files with 49 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/assets/icon_down.svg
  2. 1
      src/assets/icon_left.svg
  3. 1
      src/assets/icon_leftR.svg
  4. 1
      src/assets/icon_right.svg
  5. 1
      src/assets/icon_rightR.svg
  6. 1
      src/assets/icon_up.svg
  7. 4
      src/pages/measure/components/Detail.tsx
  8. 45
      src/pages/measure/components/MeasureAction.tsx
  9. 22
      src/pages/measure/components/MeasureConfig.tsx
  10. 2
      src/store/measure/measureState.ts

1
src/assets/icon_down.svg
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_58_9800" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><clipPath id="master_svg1_58_9798"><rect x="9" y="52" width="32" height="32" rx="0"/></clipPath></defs><g transform="matrix(1,0,0,-1,0,92)"><g transform="matrix(1,0,0,-1,0,180)" filter="url(#master_svg0_58_9800)"><ellipse cx="25" cy="112" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g clip-path="url(#master_svg1_58_9798)"><g><path d="M21.7247371875,67.9623234375L21.7247371875,81.1185234375C21.7247371875,81.5717234375,22.0934871875,81.9404234375,22.5466171875,81.9404234375L27.3966171875,81.9404234375C27.8497371875,81.9404234375,28.218517187499998,81.5717234375,28.218517187499998,81.1185234375L28.218517187499998,67.9623234375L31.5341171875,67.9623234375C31.8528171875,67.9623234375,32.0497171875,67.6154234375,31.890317187500003,67.3435234375L25.3591171875,56.2029294375C25.1997371875,55.9310546375,24.8091171875,55.9310546375,24.6497371875,56.2029294375L18.1153630875,67.3404234375C17.9528631875,67.6154234375,18.1528634875,67.9592234375,18.4716131875,67.9592234375L21.7247371875,67.9592234375L21.7247371875,67.9623234375Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></g></svg>

1
src/assets/icon_left.svg
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_58_9802" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><clipPath id="master_svg1_58_9803"><rect x="10" y="83" width="30" height="30" rx="0"/></clipPath></defs><g transform="matrix(1,0,0,-1,0,92)"><g transform="matrix(1,0,0,-1,0,180)" filter="url(#master_svg0_58_9802)"><ellipse cx="25" cy="112" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g transform="matrix(1,0,0,-1,0,166)" clip-path="url(#master_svg1_58_9803)"><g transform="matrix(0,-1,1,0,-93,117)"><path d="M15.66712,116.9633L15.66712,130.1195C15.66712,130.5727,16.03587,130.9414,16.489,130.9414L21.339,130.9414C21.79212,130.9414,22.160899999999998,130.5727,22.160899999999998,130.1195L22.160899999999998,116.9633L25.4765,116.9633C25.7952,116.9633,25.9921,116.6164,25.832700000000003,116.3445L19.3015,105.203906C19.14212,104.9320312,18.7515,104.9320312,18.59212,105.203906L12.0577459,116.3414C11.895246,116.6164,12.0952463,116.9602,12.413996,116.9602L15.66712,116.9602L15.66712,116.9633Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></g></svg>

1
src/assets/icon_leftR.svg
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_58_9791" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><clipPath id="master_svg1_58_9789"><rect x="11" y="82.00011444091797" width="29" height="28" rx="0"/></clipPath><clipPath id="master_svg2_58_9685"><rect x="12" y="85.00011444091797" width="28" height="22" rx="0"/></clipPath></defs><g transform="matrix(1,0,0,-1,0,92)"><g transform="matrix(1,0,0,-1,0,180)" filter="url(#master_svg0_58_9791)"><ellipse cx="25" cy="112" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g transform="matrix(1,0,0,-1,0,164.00022888183594)" clip-path="url(#master_svg1_58_9789)"><g clip-path="url(#master_svg2_58_9685)"><g><path d="M28.397199999999998,87.98627444091797L24.035980000000002,87.98627444091797L25.1113,86.91002444091797C25.5445,86.47652444091797,25.5445,85.75902544091797,25.1113,85.32553444091796C24.67265,84.89164144091797,23.96686,84.89164144091797,23.52817,85.32553444091796L21.03394,87.82184444091797C20.824849999999998,88.03112444091796,20.66056,88.41976444091797,20.66056,88.71872444091797C20.66056,89.01768444091798,20.824849999999998,89.40633444091797,21.03394,89.61560444091796L23.52817,92.11192444091797C23.752209999999998,92.33614444091796,24.035980000000002,92.44077444091796,24.319760000000002,92.44077444091796C24.60353,92.44077444091796,24.88731,92.33614444091796,25.1113,92.11192444091797C25.5445,91.67842444091796,25.5445,90.96092444091796,25.1113,90.52743444091797L24.81263,90.22847444091796L28.412100000000002,90.22847444091796C31.9144,90.23669444091797,34.7515,93.07617444091797,34.759699999999995,96.58141444091797C34.759699999999995,97.19421444091797,35.2675,97.70251444091797,35.8798,97.70251444091797C36.4922,97.70251444091797,37,97.19421444091797,37,96.58141444091797C36.9851,91.84285444091798,33.1466,87.98627444091797,28.397199999999998,87.98627444091797ZM31.2648,93.59177444091797L16.56823,93.59177444091797C15.701969,93.59177444091797,15,94.29432444091796,15,95.16131444091796L15,105.43061444091796C15,106.29751444091796,15.701969,107.00011444091797,16.56823,107.00011444091797L31.2648,107.00011444091797C32.131,107.00011444091797,32.833,106.29751444091796,32.833,105.43061444091796L32.833,95.16131444091796C32.847899999999996,94.29432444091796,32.131,93.59177444091797,31.2648,93.59177444091797ZM30.607599999999998,104.75791444091797L17.24033,104.75791444091797L17.24033,95.83401444091797L30.607599999999998,95.83401444091797L30.607599999999998,104.75791444091797Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></g></g></svg>

1
src/assets/icon_right.svg
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_58_9793" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter></defs><g transform="matrix(1,0,0,-1,0,92)"><g transform="matrix(1,0,0,-1,0,180)" filter="url(#master_svg0_58_9793)"><ellipse cx="25" cy="112" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g transform="matrix(0,1,-1,0,99.05224609375,23.16943359375)"><path d="M41.60852625,73.07413984375L41.60852625,86.23033984375C41.60852625,86.68353984375,41.97727625,87.05223984375,42.43040625,87.05223984375L47.28040625,87.05223984375C47.73352625,87.05223984375,48.10230625,86.68353984375,48.10230625,86.23033984375L48.10230625,73.07413984375L51.41790625,73.07413984375C51.73660625,73.07413984375,51.93350625,72.72723984375,51.77410625,72.45533984375L45.24290625,61.31474584375C45.08352625,61.04287104375,44.69290625,61.04287104375,44.53352625,61.31474584375L37.99915215,72.45223984375C37.83665225,72.72723984375,38.03665255,73.07103984375,38.35540225,73.07103984375L41.60852625,73.07103984375L41.60852625,73.07413984375Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></svg>

1
src/assets/icon_rightR.svg
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_62_9683" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter></defs><g><g filter="url(#master_svg0_62_9683)"><ellipse cx="25" cy="24" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g transform="matrix(-1,0,0,1,74,0)"><path d="M50.3972,15.98616L46.03598,15.98616L47.1113,14.90991C47.5445,14.47641,47.5445,13.758911,47.1113,13.32542C46.672650000000004,12.891527,45.96686,12.891527,45.52817,13.32542L43.03394,15.82173C42.82485,16.031010000000002,42.660560000000004,16.41965,42.660560000000004,16.718609999999998C42.660560000000004,17.01757,42.82485,17.40622,43.03394,17.61549L45.52817,20.11181C45.75221,20.33603,46.03598,20.44066,46.31976,20.44066C46.60353,20.44066,46.88731,20.33603,47.1113,20.11181C47.5445,19.67831,47.5445,18.960810000000002,47.1113,18.52732L46.81263,18.228360000000002L50.4121,18.228360000000002C53.9144,18.23658,56.7515,21.07606,56.759699999999995,24.5813C56.759699999999995,25.1941,57.2675,25.7024,57.8798,25.7024C58.4922,25.7024,59,25.1941,59,24.5813C58.9851,19.84274,55.1466,15.98616,50.3972,15.98616ZM53.2648,21.591659999999997L38.56823,21.591659999999997C37.701969,21.591659999999997,37,22.29421,37,23.1612L37,33.430499999999995C37,34.297399999999996,37.701969,35,38.56823,35L53.2648,35C54.131,35,54.833,34.297399999999996,54.833,33.430499999999995L54.833,23.1612C54.847899999999996,22.29421,54.131,21.591659999999997,53.2648,21.591659999999997ZM52.6076,32.7578L39.24033,32.7578L39.24033,23.8339L52.6076,23.8339L52.6076,32.7578Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></svg>

1
src/assets/icon_up.svg
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="50" height="50" viewBox="0 0 50 50"><defs><filter id="master_svg0_58_9785" filterUnits="objectBoundingBox" color-interpolation-filters="sRGB" x="-0.09090909090909091" y="-0.06818181818181818" width="1.1818181818181819" height="1.1818181818181819"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1" dx="0"/><feGaussianBlur stdDeviation="1"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15000000596046448 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><clipPath id="master_svg1_58_9786"><rect x="9" y="84" width="32" height="32" rx="0"/></clipPath></defs><g transform="matrix(1,0,0,-1,0,92)"><g transform="matrix(1,0,0,-1,0,180)" filter="url(#master_svg0_58_9785)"><ellipse cx="25" cy="112" rx="22" ry="22" fill="#FFFFFF" fill-opacity="1"/></g><g transform="matrix(1,0,0,-1,0,168)" clip-path="url(#master_svg1_58_9786)"><g><path d="M21.7247371875,99.9623234375L21.7247371875,113.1185234375C21.7247371875,113.5717234375,22.0934871875,113.9404234375,22.5466171875,113.9404234375L27.3966171875,113.9404234375C27.8497371875,113.9404234375,28.218517187499998,113.5717234375,28.218517187499998,113.1185234375L28.218517187499998,99.9623234375L31.5341171875,99.9623234375C31.8528171875,99.9623234375,32.0497171875,99.6154234375,31.890317187500003,99.3435234375L25.3591171875,88.2029294375C25.1997371875,87.9310546375,24.8091171875,87.9310546375,24.6497371875,88.2029294375L18.1153630875,99.3404234375C17.9528631875,99.6154234375,18.1528634875,99.9592234375,18.4716131875,99.9592234375L21.7247371875,99.9592234375L21.7247371875,99.9623234375Z" fill="#5F5F5F" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></g></svg>

4
src/pages/measure/components/Detail.tsx
View File

@ -9,6 +9,8 @@ import MeasurementCanvas from "./konva/MeasurementCanvas";
import { getReport } from "../../../services/measure/analysis";
import { getBaseRecordPointSetByCode } from "../../../services/track/trackShape"
import { useAppSelector } from "../../../utils/hooks";
import { GX_CODE } from '../../../constant';
export default function MeasureDetail() {
const {id} = useParams()
const measureState = useAppSelector((store) => store.measureState);
@ -18,7 +20,7 @@ export default function MeasureDetail() {
onShowDetail(measureId)
}, [])
const [gxCode, setGxCode] = useState<string>('')
const [gxCode, setGxCode] = useState<string>(GX_CODE)
useEffect(()=>{
setGxCode(measureState.gxCode)
}, [measureState])

45
src/pages/measure/components/MeasureAction.tsx
View File

@ -16,6 +16,12 @@ import { MeasureState, TaskState, TrackRecordSig } from "../../../services/wsTyp
import { useAppDispatch, useAppSelector } from "../../../utils/hooks";
import Gr_round from "../../../assets/green_round.svg";
import Bl_round from "../../../assets/blue_round.svg";
import icon_left from "../../../assets/icon_left.svg";
import icon_right from "../../../assets/icon_right.svg";
import icon_up from "../../../assets/icon_up.svg";
import icon_down from "../../../assets/icon_down.svg";
import icon_leftR from "../../../assets/icon_leftR.svg";
import icon_rightR from "../../../assets/icon_rightR.svg";
import MeasurementCanvas, { AnalysisData, BenchmarkShape, MeasurementCanvasRef, Point } from "./konva/MeasurementCanvas";
import "./MeasureAction.scss";
import { GX_CODE } from "../../../constant";
@ -115,6 +121,7 @@ export default function MeasureAction() {
setMeasurementFinished(false);
setAnalysisReport(null);
setshowCalibration(false)//校准线
dispatch(updateMeasureData([]))
isLeftFinished.current = false;
leftPoints.current = [];
rightPoints.current = [];
@ -141,13 +148,13 @@ export default function MeasureAction() {
// 保存按钮点击事件
const onSaveBtnClick = () => {
dispatch(updateMeasureData(newMeasureData))
navigate('/measure/config')
//将校准的数据存入store
dispatch(updateMeasureData(newMeasureData))
};
//校准
const [showCalibration, setshowCalibration] = useState(true)
const [showCalibration, setshowCalibration] = useState(false)
const [caloading, setCaLoading] = useState(false)
const onCalibrationBtnClick = () => {
setCaLoading(true)
@ -361,16 +368,16 @@ export default function MeasureAction() {
if(list && list.length){
list.forEach(item => {
if(type === 'up'){//向上移动，原数据减y X轴不动
item.y = item.y - 0.1;
item.y = item.y - distance/1000;
}
if(type === 'down'){//向上移动，原数据加y X轴不动
item.y = item.y + 0.1;
item.y = item.y + distance/1000;
}
if(type === 'left'){//向左移动，原数据减x Y轴不动
item.x = item.x - 0.1;
item.x = item.x - distance/1000;
}
if(type === 'right'){//向右移动，原数据加x Y轴不动
item.x = item.x + 0.1;
item.x = item.x + distance/1000;
}
})
canvasRef.current?.setMeasurementCalibrationData(list)
@ -381,14 +388,15 @@ export default function MeasureAction() {
//旋转
let [measurementRotation, setMeasurementRotation] = useState<number>(0)
let [newMeasureData, setNewMeasureData] = useState<Point[]>()
let [angle, setAngle] = useState<number>(0)
let [angle, setAngle] = useState<number>(1);//角度单位 分
let [distance, setDistance] = useState<number>(10)
const onRotationLine = (type:string) => {
let mrValue = 0
if(type === 'left'){//逆时针
mrValue = measurementRotation - angle * Math.PI / 180;
mrValue = measurementRotation - (angle/60) * Math.PI / 180;
}
if(type === 'right'){//顺时针
mrValue = measurementRotation + angle * Math.PI / 180;
mrValue = measurementRotation + (angle/60) * Math.PI / 180;
}
let list = canvasRef.current?.getMeasurementCalibrationData()
if(list && list.length){
@ -494,14 +502,19 @@ export default function MeasureAction() {
</div>
{showCalibration &&
<div className="flex justify-center h-[50px]">
<UpOutlined onClick={()=>(onMoveLine("up"))} className="text-[20px] ml-[20px]"/>
<DownOutlined onClick={()=>(onMoveLine("down"))} className="text-[20px] ml-[20px]"/>
<LeftOutlined onClick={()=>(onMoveLine("left"))} className="text-[20px] ml-[20px]"/>
<RightOutlined onClick={()=>(onMoveLine("right"))} className="text-[20px] ml-[20px]"/>
<UndoOutlined onClick={()=>(onRotationLine("left"))} className="text-[20px] ml-[20px]"/>
<RedoOutlined onClick={()=>(onRotationLine("right"))} className="text-[20px] ml-[20px]"/>
<div className="mt-[12px]">
移动距离：<InputNumber defaultValue={distance} placeholder="微米" onChange={(value) => value !== null && setDistance(Number(value))}></InputNumber>
<span>微米</span>
</div>
<img width={40} src={icon_left} onClick={()=>(onMoveLine("left"))} className="text-[20px] ml-[20px]" alt="左移"/>
<img width={40} src={icon_right} onClick={()=>(onMoveLine("right"))} className="text-[20px] ml-[20px]" alt="右移"/>
<img width={40} src={icon_up} onClick={()=>(onMoveLine("up"))} className="text-[20px] ml-[20px]" alt="上移"/>
<img width={40} src={icon_down} onClick={()=>(onMoveLine("down"))} className="text-[20px] ml-[20px]" alt="下移"/>
<img width={40} src={icon_leftR} onClick={()=>(onRotationLine("left"))} className="text-[20px] ml-[20px]" alt="逆时针旋转"/>
<img width={40} src={icon_rightR} onClick={()=>(onRotationLine("right"))} className="text-[20px] ml-[20px]" alt="顺时针旋转"/>
<div className="mt-[12px] ml-[20px]">
旋转角度：<InputNumber size="small" onChange={(value) => value !== null && setAngle(Number(value))}></InputNumber>
旋转角度：<InputNumber placeholder="请输入角度" defaultValue={angle} onChange={(value) => value !== null && setAngle(Number(value))}></InputNumber>
<span>分</span>
</div>
</div>
}

22
src/pages/measure/components/MeasureConfig.tsx
View File

@ -29,18 +29,10 @@ export default function MeasureConfig() {
const [messageApi, contextHolder] = message.useMessage();
const dispatch = useAppDispatch();
const context = useAppSelector((store) => store.context);
const deviceState = useAppSelector((store) => store.deviceState);
const measureState = useAppSelector((store) => store.measureState);
const [extraDesc, setExtraDesc] = useState<extraDescType>()
const onFinish = (values: any) => {
console.log("Received values of form: ", values);
//判断是否连接了设备
if (!deviceState.isConnect) {
// message.error('设备尚未连接或连接失败，请重新连接')
// return;
}
let mtValue = values["meters"]
//百米小于100时， 补齐3位。 比如 1 ："001", 10: "010"
if (mtValue < 100) {
mtValue = String(mtValue).padStart(3, '0');
@ -66,6 +58,7 @@ export default function MeasureConfig() {
turnoutNum: values["turnoutNum"],//道岔号
sleeperNum: values["sleeperNum"],//枕木号
extraDesc:JSON.stringify(extraDesc),
alignPoints:[]
};
const orgItem = {
@ -75,6 +68,11 @@ export default function MeasureConfig() {
}
localStorage.setItem('orgInfo', JSON.stringify(orgItem));
params.extraDesc = JSON.stringify(extraDesc)
let measureData = measureState.measureData;
console.log('measureState=====1===', measureState.measureData)
if(measureData && measureData.length){
params.alignPoints = measureData
}
saveMeasurement_new(params)
.then((res) => {
if (res.success) {
@ -90,9 +88,6 @@ export default function MeasureConfig() {
};
let user = localStorage.getItem("user") || "";
let userInfo = (user && JSON.parse(user)) || {};
if (context.user.loginUser && context.user.loginUser.nickname) {
// setNickName(context.user.loginUser.nickname)
}
const [form] = Form.useForm();
useEffect(() => {
queryKTJOrgList();
@ -101,6 +96,9 @@ export default function MeasureConfig() {
resetRailTypes()
}, []);
useEffect(()=>{
}, [measureState.measureData])
//给股别分类
const [unitTypeList, setUnitTypeList] = useState<unitTypesOptions[]>([])
const resetRailTypes = () => {

2
src/store/measure/measureState.ts
View File

@ -16,7 +16,7 @@ export const measureStateSlice = createSlice({
state.gxCode = payload.gxCode || "GX-60";
},
updateMeasureData: (state, { payload }) => {
state.measureData = payload.measureData
state.measureData = payload
},
},
});

Write Preview
Loading…
Cancel
Save