diff --git a/public/assets/images/fb010.png b/public/assets/images/fb010.png new file mode 100644 index 000000000..fda11d08e Binary files /dev/null and b/public/assets/images/fb010.png differ diff --git a/src/views/gcaqjc/gcaqfx/jrx/index.js b/src/views/gcaqjc/gcaqfx/jrx/index.js index d1c306570..c23693c67 100644 --- a/src/views/gcaqjc/gcaqfx/jrx/index.js +++ b/src/views/gcaqjc/gcaqfx/jrx/index.js @@ -19,6 +19,8 @@ export default function Xmzlmb() { 'ZB0+252': '4', 'ZB0+370': '5', 'ZB0+372': '6', + 'FB0+010': '7', + 'FB0+030': '8', } const role = useSelector(state => state.auth.role); const [code, setCode] = useState([]) @@ -126,7 +128,7 @@ export default function Xmzlmb() { try { const res = await httppost2(apiurl.gcaqjc.sjtjcx.sycx.list) const newData = res.data.map(s => ({ projNm: s.profileName, id: s.profileCode })) - const filterData = newData.filter(item => item?.projNm?.split('+')[0] == 'ZB0') + const filterData = newData.filter(item => (item?.projNm?.split('+')[0] == 'ZB0' ||item?.projNm?.split('+')[0] == 'FB0')) setDmList(filterData); } catch (error) { console.log(error); @@ -190,7 +192,8 @@ export default function Xmzlmb() { let name = dmList.find(s => s.id == code)?.projNm let type = (name == "ZB0+130" || name == "ZB0+132") ? "1" : (name == "ZB0+250" || name == "ZB0+252") ? "2" : - (name == "ZB0+370" || name == "ZB0+372") ? "3" : ''; + (name == "ZB0+370" || name == "ZB0+372") ? "3" : + (name == "FB0+010" || name == "FB0+030") ? '4' : ''; let type1 = typeName[name]; setDbType(type) setDbType1(type1) diff --git a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js index ac7e4baf4..e417bd9ac 100644 --- a/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js +++ b/src/views/gcaqjc/gcaqfx/jrx/jrxOptions.js @@ -1,25 +1,34 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { // debugger + console.log("data",data); + // data.rz = 112 + // 根据断面类型确定y轴刻度以及最大和最小 const yMin = type == "3" ? 70 : type == "2" ? 67 : - type == '1' ? 59 : 70; + type == '1' ? 59 : 99; const yMax = type == "3" ? 129 : type == "2" ? 117 - : type == "1" ? 118 : 150; + : type == "1" ? 118 : 116; + + // 断面上的渗压管 const type1 = ["UPD1", "UPD4", "UPD10", "UPD16"]; const type2 = ["UPD7", "UPD13"]; const type3 = ["UPD2", "UPD5", "UPD8", "UPD17"]; const type4 = ["UPD11", "UPD14"]; const type5 = ["UPD3", "UPD6", "UPD9"]; const type6 = ["UPD12", "UPD15"]; + const type7 = ["UPD24", "UPD26","UPD28"]; //UPD24:109.87,UPD26:109.75,UPD28:109.43 + const type8 = ["UPD25", "UPD27","UPD29"]; //UPD25:109.87,UPD27:109.75,UPD29:109.43 // 管底高程 - const alltype = typeName == "1" ? type1 : typeName == "2" ? type2 : typeName == "3" ? type3 : typeName == "4" ? type4 : typeName == "5" ? type5 : - typeName == "6" ? type6 :[] + typeName == "6" ? type6 : + typeName == "7" ? type7 : + typeName == "8" ? type8 : + [] ; // 字体颜色 @@ -27,9 +36,10 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { const imageUrl370 = `${process.env.PUBLIC_URL}/assets/images/zb370.png ` const imageUrl250 = `${process.env.PUBLIC_URL}/assets/images/zb250.png ` const imageUrl130 = `${process.env.PUBLIC_URL}/assets/images/zb130.png ` + const imageUrl010 = `${process.env.PUBLIC_URL}/assets/images/fb010.png ` const imageUrl = type == "1" ? imageUrl130 : type == "2" ? imageUrl250 : - type == "3" ? imageUrl370 : imageUrl370 + type == "3" ? imageUrl370 : imageUrl010 ; const rule = `${process.env.PUBLIC_URL}/assets/images/ruler.png ` @@ -37,7 +47,7 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { const xValue = type == "3" ? (((data?.rz - 86) + 0.6 * 5) / 0.6) : type == "2" ? (((data?.rz - 87) + 0.63 * 7) / 0.63) : type == "1" ? (((data?.rz - 88) + 0.7 * 10) / 0.7) : - (((data?.rz - 99) + 1 * 14) / 1) + Math.abs((((data?.rz - 110) + 0.2 * 12) / 0.2)) const rz = data?.rz ? [[xValue, data?.rz], [0, data?.rz],] : [] @@ -50,29 +60,30 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { type == "1" ? [[0, 88], [10, 88], [xValue, data?.rz]] : - [[0, 99], [14, 99], [xValue, data?.rz]] + [[0, 110], [12, 110], [xValue, data?.rz]] : [] // gz1、gz2、gz3、gz4分别为渗压管 const gz1 = data[alltype[0]] ? - type == "3" ? [[47, typeName =='5' ?76.56:92.18], [47, data[alltype[0]]]] : + type == "3" ? [[51, typeName =='5' ?76.56:92.18], [51, data[alltype[0]]]] : type == "2" ? [[45.5, typeName =='3' ?76.16:77.18], [45.5, data[alltype[0]]]] : type == "1" ? [[44, typeName =='1' ?79.16:77.18], [44, data[alltype[0]]]] : - [[47.5, 158], [85, data[alltype[0]]]] + [[39, 109.87], [39, data[alltype[0]]]] : []; + const gz2 = data[alltype[1]] ? - type == "3" ? [[51, typeName =='5' ?77.18:83.50], [51, data[alltype[1]]]] : + type == "3" ? [[62, typeName =='5' ?77.18:83.50], [62, data[alltype[1]]]] : type == "2" ? [[50, typeName =='3' ?77.18:77.50], [50, data[alltype[1]]]] : type == "1" ? [[51.5, typeName =='1' ?77.18:74.5], [51.5, data[alltype[1]]]] : - [[53.6, 158], [53.6, data[alltype[1]]]] : + [[51, 109.75], [53.6, data[alltype[1]]]] : []; const gz3 = data[alltype[2]] ? type == "3" ? [[58.5, 81.50], [58.5, data[alltype[2]]]] : type == "2" ? [[58, 80.50], [58, data[alltype[2]]]] : type == "1" ? [[58, 66.50], [58, data[alltype[2]]]] : - [[73, 161], [73, data[alltype[2]]]] : []; + [[66, 109.43], [73, data[alltype[2]]]] : []; const gz4 = data[alltype[3]] ? @@ -86,8 +97,8 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { type == "3" ? [ [xValue, data?.rz], - [47, data[alltype[0]]], - [51, data[alltype[1]]], + [51, data[alltype[0]]], + [62, data[alltype[1]]], [58.5, data[alltype[2]]], ] : @@ -109,9 +120,9 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { ]: [ [xValue, data?.rz], - [51.6, data[alltype[0]]], - [53.6, data[alltype[1]]], - [73, data[alltype[2]]], + [39, data[alltype[0]]], + [51, data[alltype[1]]], + [66, data[alltype[2]]], [85, data[alltype[3]]] ] : []