feat(): 添加fb0类型浸润线
parent
1cce27996d
commit
3661da3195
File diff suppressed because one or more lines are too long
|
|
@ -77,6 +77,8 @@
|
||||||
'ZB0+252': '4',
|
'ZB0+252': '4',
|
||||||
'ZB0+370': '5',
|
'ZB0+370': '5',
|
||||||
'ZB0+372': '6',
|
'ZB0+372': '6',
|
||||||
|
'FB0+010': '7',
|
||||||
|
'FB0+030': '8',
|
||||||
}
|
}
|
||||||
export default {
|
export default {
|
||||||
|
|
||||||
|
|
@ -154,7 +156,8 @@
|
||||||
let name = this.array.find(item => item.profileCode == newVal).profileName;
|
let name = this.array.find(item => item.profileCode == newVal).profileName;
|
||||||
this.dbType = (name == "ZB0+130" || name == "ZB0+132") ? "1" :
|
this.dbType = (name == "ZB0+130" || name == "ZB0+132") ? "1" :
|
||||||
(name == "ZB0+250" || name == "ZB0+252") ? "2" :
|
(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' : '';
|
||||||
this.type1 = typeName[name];
|
this.type1 = typeName[name];
|
||||||
this.getDmTree();
|
this.getDmTree();
|
||||||
}
|
}
|
||||||
|
|
@ -261,11 +264,20 @@
|
||||||
`/gunshiApp/tsg/attDamProfile/list`,)
|
`/gunshiApp/tsg/attDamProfile/list`,)
|
||||||
if (data.code == 200) {
|
if (data.code == 200) {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
const filterData = data.data.filter(item => item?.profileName?.split('+')[0] == 'ZB0')
|
const filterData = data.data.filter(item => (item?.profileName?.split('+')[0] == 'ZB0' || item?.profileName?.split('+')[0] == 'FB0'))
|
||||||
console.log("filterData", filterData);
|
console.log("filterData", filterData);
|
||||||
|
const sortedData = filterData.sort((a, b) => {
|
||||||
|
// 判断a、b是否为ZB0开头
|
||||||
|
const isAZB0 = a.profileCode.startsWith('ZB0');
|
||||||
|
const isBZB0 = b.profileCode.startsWith('ZB0');
|
||||||
|
|
||||||
this.array = filterData
|
// 规则:ZB0开头的排前面;同类型(都ZB0/都非ZB0)保持原顺序
|
||||||
this.profileCode = filterData[0].profileCode;
|
if (isAZB0 && !isBZB0) return -1; // a是ZB0,b不是 → a在前
|
||||||
|
if (!isAZB0 && isBZB0) return 1; // a不是ZB0,b是 → b在前
|
||||||
|
return 0; // 同类型,保持原始相对顺序
|
||||||
|
});
|
||||||
|
this.array = sortedData
|
||||||
|
this.profileCode = sortedData[0].profileCode;
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
uni.$showMsg();
|
uni.$showMsg();
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import { imageUrl060,imageUrl090,rule } from './dataUrl'
|
||||||
import imageUrl130 from './dataUrl1/zb130';
|
import imageUrl130 from './dataUrl1/zb130';
|
||||||
import imageUrl250 from './dataUrl1/zb250';
|
import imageUrl250 from './dataUrl1/zb250';
|
||||||
import imageUrl370 from './dataUrl1/zb370';
|
import imageUrl370 from './dataUrl1/zb370';
|
||||||
|
import imageUrl010 from './dataUrl1/fb010';
|
||||||
|
|
||||||
|
|
||||||
export default function jrxOptions(data = {}, type = "1", typeName = '1') {
|
export default function jrxOptions(data = {}, type = "1", typeName = '1') {
|
||||||
|
|
@ -76,21 +77,26 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
|
||||||
// : []
|
// : []
|
||||||
|
|
||||||
const yMin = type == "3" ? 70 : type == "2" ? 67 :
|
const yMin = type == "3" ? 70 : type == "2" ? 67 :
|
||||||
type == '1' ? 58 : 70;
|
type == '1' ? 58 : 99;
|
||||||
const yMax = type == "3" ? 129 : type == "2" ? 117
|
const yMax = type == "3" ? 129 : type == "2" ? 117
|
||||||
: type == "1" ? 118 : 150;
|
: type == "1" ? 118 : 116;
|
||||||
const type1 = ["UPD1", "UPD4", "UPD10", "UPD16"];
|
const type1 = ["UPD1", "UPD4", "UPD10", "UPD16"];
|
||||||
const type2 = ["UPD7", "UPD13"];
|
const type2 = ["UPD7", "UPD13"];
|
||||||
const type3 = ["UPD2", "UPD5", "UPD8", "UPD17"];
|
const type3 = ["UPD2", "UPD5", "UPD8", "UPD17"];
|
||||||
const type4 = ["UPD11", "UPD14"];
|
const type4 = ["UPD11", "UPD14"];
|
||||||
const type5 = ["UPD3", "UPD6", "UPD9"];
|
const type5 = ["UPD3", "UPD6", "UPD9"];
|
||||||
const type6 = ["UPD12", "UPD15"];
|
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 :
|
const alltype = typeName == "1" ? type1 :
|
||||||
typeName == "2" ? type2 :
|
typeName == "2" ? type2 :
|
||||||
typeName == "3" ? type3 :
|
typeName == "3" ? type3 :
|
||||||
typeName == "4" ? type4 :
|
typeName == "4" ? type4 :
|
||||||
typeName == "5" ? type5 :
|
typeName == "5" ? type5 :
|
||||||
typeName == "6" ? type6 :[]
|
typeName == "6" ? type6 :
|
||||||
|
typeName == "7" ? type7 :
|
||||||
|
typeName == "8" ? type8 :
|
||||||
|
[];
|
||||||
;
|
;
|
||||||
|
|
||||||
// 字体颜色
|
// 字体颜色
|
||||||
|
|
@ -100,15 +106,14 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
|
||||||
// const imageUrl130 = `${process.env.PUBLIC_URL}/assets/images/zb130.png `
|
// const imageUrl130 = `${process.env.PUBLIC_URL}/assets/images/zb130.png `
|
||||||
const imageUrl = type == "1" ? imageUrl130 :
|
const imageUrl = type == "1" ? imageUrl130 :
|
||||||
type == "2" ? imageUrl250 :
|
type == "2" ? imageUrl250 :
|
||||||
type == "3" ? imageUrl370 : imageUrl370
|
type == "3" ? imageUrl370 : imageUrl010;
|
||||||
;
|
|
||||||
// const rule = `${process.env.PUBLIC_URL}/assets/images/ruler.png `
|
// const rule = `${process.env.PUBLIC_URL}/assets/images/ruler.png `
|
||||||
|
|
||||||
// rz 是最上面那条线 rz1是那条贴近坝面的线 xValue求解的是最上面那条线的末尾横坐标
|
// rz 是最上面那条线 rz1是那条贴近坝面的线 xValue求解的是最上面那条线的末尾横坐标
|
||||||
const xValue = type == "3" ? (((data?.rz - 86) + 0.6 * 5) / 0.6) :
|
const xValue = type == "3" ? (((data?.rz - 86) + 0.6 * 5) / 0.6) :
|
||||||
type == "2" ? (((data?.rz - 87) + 0.63 * 7) / 0.63) :
|
type == "2" ? (((data?.rz - 87) + 0.63 * 7) / 0.63) :
|
||||||
type == "1" ? (((data?.rz - 87) + 0.67 * 10) / 0.67) :
|
type == "1" ? (((data?.rz - 87) + 0.67 * 10) / 0.67) :
|
||||||
(((data?.rz - 99) + 1 * 14) / 1)
|
(((data?.rz - 102) + 0.25 * 4) / 0.25)
|
||||||
const rz = data?.rz ?
|
const rz = data?.rz ?
|
||||||
[[xValue, data?.rz], [0, data?.rz],] :
|
[[xValue, data?.rz], [0, data?.rz],] :
|
||||||
[]
|
[]
|
||||||
|
|
@ -121,7 +126,7 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
|
||||||
type == "1" ?
|
type == "1" ?
|
||||||
[[0, 87], [8, 87], [xValue, data?.rz]]
|
[[0, 87], [8, 87], [xValue, data?.rz]]
|
||||||
:
|
:
|
||||||
[[0, 99], [14, 99], [xValue, data?.rz]]
|
[[0, 102], [4, 102], [xValue, data?.rz]]
|
||||||
:
|
:
|
||||||
[]
|
[]
|
||||||
// gz1、gz2、gz3、gz4分别为渗压管
|
// gz1、gz2、gz3、gz4分别为渗压管
|
||||||
|
|
@ -129,21 +134,21 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
|
||||||
type == "3" ? [[52, typeName =='5' ?76.56:92.18], [52, data[alltype[0]]]] :
|
type == "3" ? [[52, typeName =='5' ?76.56:92.18], [52, data[alltype[0]]]] :
|
||||||
type == "2" ? [[52, typeName =='3' ?76.16:77.18], [52, data[alltype[0]]]] :
|
type == "2" ? [[52, typeName =='3' ?76.16:77.18], [52, data[alltype[0]]]] :
|
||||||
type == "1" ? [[49, typeName =='1' ?79.16:77.18], [49, data[alltype[0]]]] :
|
type == "1" ? [[49, typeName =='1' ?79.16:77.18], [49, data[alltype[0]]]] :
|
||||||
[[47.5, 158], [85, data[alltype[0]]]]
|
[[62, 109.87], [62, data[alltype[0]]]]
|
||||||
: [];
|
: [];
|
||||||
|
|
||||||
const gz2 = data[alltype[1]] ?
|
const gz2 = data[alltype[1]] ?
|
||||||
type == "3" ? [[57, typeName =='5' ?77.18:83.50], [57, data[alltype[1]]]] :
|
type == "3" ? [[57, typeName =='5' ?77.18:83.50], [57, data[alltype[1]]]] :
|
||||||
type == "2" ? [[55, typeName =='3' ?77.18:77.50], [55, data[alltype[1]]]] :
|
type == "2" ? [[55, typeName =='3' ?77.18:77.50], [55, data[alltype[1]]]] :
|
||||||
type == "1" ? [[57, typeName =='1' ?77.18:74.5], [57, data[alltype[1]]]] :
|
type == "1" ? [[57, typeName =='1' ?77.18:74.5], [57, data[alltype[1]]]] :
|
||||||
[[53.6, 158], [53.6, data[alltype[1]]]] :
|
[[72, 109.75], [72, data[alltype[1]]]] :
|
||||||
[];
|
[];
|
||||||
|
|
||||||
const gz3 = data[alltype[2]] ?
|
const gz3 = data[alltype[2]] ?
|
||||||
type == "3" ? [[65, 81.50], [65, data[alltype[2]]]] :
|
type == "3" ? [[65, 81.50], [65, data[alltype[2]]]] :
|
||||||
type == "2" ? [[63, 80.50], [63, data[alltype[2]]]] :
|
type == "2" ? [[63, 80.50], [63, data[alltype[2]]]] :
|
||||||
type == "1" ? [[67, 66.50], [79, data[alltype[2]]]] :
|
type == "1" ? [[67, 66.50], [79, data[alltype[2]]]] :
|
||||||
[[73, 161], [73, data[alltype[2]]]] : [];
|
[[87, 109.43], [87, data[alltype[2]]]] : [];
|
||||||
|
|
||||||
|
|
||||||
const gz4 = data[alltype[3]] ?
|
const gz4 = data[alltype[3]] ?
|
||||||
|
|
@ -180,9 +185,9 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') {
|
||||||
] :
|
] :
|
||||||
[
|
[
|
||||||
[xValue, data?.rz],
|
[xValue, data?.rz],
|
||||||
[51.6, data[alltype[0]]],
|
[62, data[alltype[0]]],
|
||||||
[53.6, data[alltype[1]]],
|
[72, data[alltype[1]]],
|
||||||
[73, data[alltype[2]]],
|
[87, data[alltype[2]]],
|
||||||
[85, data[alltype[3]]]
|
[85, data[alltype[3]]]
|
||||||
]
|
]
|
||||||
: [];
|
: [];
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue