提交代码
parent
52c1ae2e01
commit
5cee0f7e19
|
@ -327,7 +327,10 @@
|
||||||
style="position: absolute; cursor: pointer; right: 12px; top: 12px"
|
style="position: absolute; cursor: pointer; right: 12px; top: 12px"
|
||||||
@click="doShowMeasuredDlg"
|
@click="doShowMeasuredDlg"
|
||||||
/>
|
/>
|
||||||
<div class="warning-info-title warning-info-title_div measured-data-list" style="padding-left: 2px;position: relative;z-index: 9;">
|
<div
|
||||||
|
class="warning-info-title warning-info-title_div measured-data-list"
|
||||||
|
style="padding-left: 2px; position: relative; z-index: 9"
|
||||||
|
>
|
||||||
<div
|
<div
|
||||||
:class="measuredNav == 0 ? 'active' : ''"
|
:class="measuredNav == 0 ? 'active' : ''"
|
||||||
@click="doMeasuredNav(0, '汇总')"
|
@click="doMeasuredNav(0, '汇总')"
|
||||||
|
@ -505,7 +508,7 @@ export default {
|
||||||
icon: "rect",
|
icon: "rect",
|
||||||
orient: "horizontal",
|
orient: "horizontal",
|
||||||
itemWidth: "50%",
|
itemWidth: "50%",
|
||||||
left:240,
|
left: 240,
|
||||||
right: "10%",
|
right: "10%",
|
||||||
itemWidth: 20,
|
itemWidth: 20,
|
||||||
itemGap: 20,
|
itemGap: 20,
|
||||||
|
@ -754,7 +757,25 @@ export default {
|
||||||
postData.deptId = this.dept?.id || 0;
|
postData.deptId = this.dept?.id || 0;
|
||||||
postData.projectId = this.projectInfo?.id || 0;
|
postData.projectId = this.projectInfo?.id || 0;
|
||||||
this.$api.measure.groupMeasureInfo(postData).then((d) => {
|
this.$api.measure.groupMeasureInfo(postData).then((d) => {
|
||||||
this.measuredData = (d.data || []).map((it) => {
|
let list = [];
|
||||||
|
if (d.data.length > 0) {
|
||||||
|
if (n == 6) {
|
||||||
|
d.data.forEach((item) => {
|
||||||
|
if (item.measureInfo == "间距" || item.measureInfo == "长度") {
|
||||||
|
list.push(item);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else if (n == 0) {
|
||||||
|
list = d || [];
|
||||||
|
} else {
|
||||||
|
d.data.forEach((item) => {
|
||||||
|
if (item.measureInfo != "间距" && item.measureInfo != "长度") {
|
||||||
|
list.push(item);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.measuredData = list.map((it) => {
|
||||||
return {
|
return {
|
||||||
name: it.measureInfo,
|
name: it.measureInfo,
|
||||||
value: it.id,
|
value: it.id,
|
||||||
|
|
Loading…
Reference in New Issue