From 244c4241427b9f3316f06f1e0ae2ee571edc1a23 Mon Sep 17 00:00:00 2001
From: tanghaolin <1723298894@qq.com>
Date: 星期三, 31 八月 2022 16:11:20 +0800
Subject: [PATCH] 合并系列详情 图表曲线对应的参数点和查询点表格
---
src/views/Detail/byParas/components/LXBSelectMainPoint.vue | 196 +++++++++++++++++++++++++++++++++++++++----------
src/views/Detail/byParas/Index.vue | 2
src/views/Detail/byParas/components/LXBChartPointParas.vue | 10 +-
src/router/index.js | 1
src/views/Select/SelSeries.vue | 21 ++---
5 files changed, 172 insertions(+), 58 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 4163eab..4fb734d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -159,6 +159,7 @@
cache: false,
noFrame: false,
noPermissionValidate: true,
+ keepAlive:true
},
component: () =>
import('../views/Select/SelSeries.vue'),
diff --git a/src/views/Detail/byParas/Index.vue b/src/views/Detail/byParas/Index.vue
index 9bb3177..8cfccf1 100644
--- a/src/views/Detail/byParas/Index.vue
+++ b/src/views/Detail/byParas/Index.vue
@@ -921,7 +921,7 @@
//淇敼鏌ヨ鍊�(缁欏瓙鎺т欢璋冪敤)
cbChangeChartQueryData(val) {
if (this.PumpStyle == ConstParas.PumpStyle.LXP) {
- this.$refs.lxbChartPointParasCtrl.buildChartQueryData(val);
+ this.$refs.lxbSelectPointCtrl.buildChartQueryData(val);
}
},
//璁剧疆BIM鏂囦欢
diff --git a/src/views/Detail/byParas/components/LXBChartPointParas.vue b/src/views/Detail/byParas/components/LXBChartPointParas.vue
index 2e0d393..9604aaf 100644
--- a/src/views/Detail/byParas/components/LXBChartPointParas.vue
+++ b/src/views/Detail/byParas/components/LXBChartPointParas.vue
@@ -3,7 +3,7 @@
<van-collapse v-model="activeNames">
<van-collapse-item
:title="$t('detailPage.queryPoint.TR')"
- v-show="m_isChartQueryTableVisible"
+ v-if="false"
>
<div style="display: flex; margin-top: 0.1rem">
<van-col :span="6">
@@ -268,7 +268,7 @@
buildPointTable_General(pumpInfoData) {
if (pumpInfoData.ChartPointPara == null) return;
- // console.log(pumpInfoData.ChartPointPara, 285);
+ console.log(pumpInfoData.ChartPointPara, 285);
let _this = this;
@@ -496,7 +496,7 @@
dataChartPointGrid.push(ZeroPtObj);
}
- //console.log(dataChartPointGrid, 737);
+ console.log(dataChartPointGrid, 737);
_this.m_dataChartPointGrid = dataChartPointGrid;
},
//
@@ -889,7 +889,7 @@
},
//鏋勫缓鏌ヨ鍙傛暟
buildChartQueryData(query_pt) {
- // console.log(query_pt, 799);
+ console.log(query_pt, 799);
if (query_pt == null) {
return;
}
@@ -946,7 +946,7 @@
obj.nodeList.push(chartPointNode);
this.m_chartQueryData = obj;
- // console.log("m_chartQueryData", this.m_chartQueryData);
+ console.log("m_chartQueryData", this.m_chartQueryData);
},
//澶栭儴鑾峰彇閫夊瀷鍙傛暟
getDesignParas() {
diff --git a/src/views/Detail/byParas/components/LXBSelectMainPoint.vue b/src/views/Detail/byParas/components/LXBSelectMainPoint.vue
index ee40266..823bc55 100644
--- a/src/views/Detail/byParas/components/LXBSelectMainPoint.vue
+++ b/src/views/Detail/byParas/components/LXBSelectMainPoint.vue
@@ -1,29 +1,52 @@
<template>
<div>
<van-collapse v-model="activeNames">
- <van-collapse-item :title="$t('detailPage.parameter.TR')">
+ <van-collapse-item :title="$t('detailPage.parameter.TR')" name="1">
<div style="display: flex; margin-top: 0.1rem">
<van-col :span="6">
<div class="table_box">
- <div class="content2 table_head" style="border-top: 1px solid #e9e9e9">{{$t('detailPage.parameter.TR')}}</div>
- </div>
- </van-col>
- <van-col :span="12">
- <div class="table_box">
- <div class="content2 table_head" style="border-top: 1px solid #e9e9e9">{{$t('detailPage.data.TR')}}</div>
+ <div
+ class="content2 table_head"
+ style="border-top: 1px solid #e9e9e9"
+ >
+ {{ $t("detailPage.parameter.TR") }}
+ </div>
</div>
</van-col>
<van-col :span="6">
<div class="table_box">
- <div class="content3 table_head" style="border-top: 1px solid #e9e9e9">{{$t('detailPage.unit.TR')}}</div>
+ <div
+ class="content2 table_head"
+ style="border-top: 1px solid #e9e9e9"
+ >
+ {{ $t("detailPage.data.TR") }}
+ </div>
+ </div>
+ </van-col>
+ <van-col :span="6">
+ <div class="table_box">
+ <div
+ class="content2 table_head"
+ style="border-top: 1px solid #e9e9e9"
+ >
+ 鏌ヨ鐐规暟鎹�
+ </div>
+ </div>
+ </van-col>
+ <van-col :span="6">
+ <div class="table_box">
+ <div
+ class="content3 table_head"
+ style="border-top: 1px solid #e9e9e9"
+ >
+ {{ $t("detailPage.unit.TR") }}
+ </div>
</div>
</van-col>
</div>
<div
style="display: flex; flex-direction: column"
- v-for="(
- mainParas_item, mainParas_index
- ) in paraTable4Disp.nodeList"
+ v-for="(mainParas_item, mainParas_index) in paraTable4Disp.nodeList"
:key="'searchTable' + mainParas_index"
>
<div style="width: 100%">
@@ -33,10 +56,14 @@
<div class="content2">{{ mainParas_item.Name }}</div>
</div>
</van-col>
- <van-col :span="12" style="display: flex">
+ <van-col :span="6" style="display: flex">
<div class="table_box">
<div class="content2" v-if="mainParas_item.IsEditAble">
- <van-field v-if="mainParas_item.Tag == 'RequestPointH'" v-model="mainParas_item.Value" label />
+ <van-field
+ v-if="mainParas_item.Tag == 'RequestPointH'"
+ v-model="mainParas_item.Value"
+ label
+ />
<span
@click.stop="clickGridRowRefreshByDp"
v-if="mainParas_item.Tag == 'RequestPointH'"
@@ -46,14 +73,27 @@
v-else-if="mainParas_item.Tag == 'MotorPower'"
readonly
clickable
- style="text-align:center"
+ style="text-align: center"
name="picker"
- @click="showMotorValueComboxPicker(mainParas_index,mainParas_item)"
+ @click="
+ showMotorValueComboxPicker(
+ mainParas_index,
+ mainParas_item
+ )
+ "
>
- <template slot="input">
+ <template #input>
<div
- style="text-decoration: underline;color: blue;width: 100%;text-align: center;font-size:12px;"
- >{{mainParas_item.Value}}</div>
+ style="
+ text-decoration: underline;
+ color: blue;
+ width: 100%;
+ text-align: center;
+ font-size: 12px;
+ "
+ >
+ {{ mainParas_item.Value }}
+ </div>
</template>
</van-field>
<van-field v-else v-model="mainParas_item.Value" label />
@@ -70,6 +110,11 @@
</van-popup>
</div>
<div class="content2" v-else>{{ mainParas_item.Value }}</div>
+ </div>
+ </van-col>
+ <van-col :span="6" style="display: flex">
+ <div class="table_box">
+ <div class="content2">{{ mainParas_item.chartQueryPt }}</div>
</div>
</van-col>
<van-col :span="6" style="display: flex">
@@ -91,17 +136,18 @@
mixins: [languageMixin],
data() {
return {
- show:true,
+ show: true,
activeNames: ["1"],
m_chartType: 0,
paraTable4Disp: {}, //鍙傛暟閫夊瀷
MainParaItemList: [], //鍙傛暟閫夊瀷鍒楄〃
-
+ m_query_pt_data: {}, //鍥捐〃鏌ヨ鏁版嵁
+ isFirstLoadingQueryPt: true, //鏄惁鏄涓�娆″姞杞芥煡璇㈠弬鏁�
unitSetting: {
Q: UnitHelper.Default.Q,
H: UnitHelper.Default.H,
- P: UnitHelper.Default.P
- } //榛樿鍗曚綅
+ P: UnitHelper.Default.P,
+ }, //榛樿鍗曚綅
};
},
methods: {
@@ -125,29 +171,84 @@
_this.buildTable(pumpInfoData.MainParaItemList);
},
+ //鏋勫缓琛ㄦ牸
buildTable(mainParaItemList) {
if (mainParaItemList == null) {
return;
}
let _this = this;
+ if(_this.isFirstLoadingQueryPt){
+ let pointObj = {
+ IsEditAble: false,
+ Name: "鏁堢巼",
+ Range: null,
+ Tag: "RequestPointE",
+ Unit: 0,
+ UnitName: "%",
+ Value: "",
+ isShowPicker: false,
+ userUnit: [],
+ };
+ mainParaItemList.push(pointObj);
+ pointObj = {
+ IsEditAble: false,
+ Name: "鍔熺巼",
+ Range: null,
+ Tag: "RequestPointP",
+ Unit: 0,
+ UnitName: "kw",
+ Value: "",
+ isShowPicker: false,
+ userUnit: [],
+ };
+ mainParaItemList.push(pointObj);
+ pointObj = {
+ IsEditAble: false,
+ Name: "姹借殌",
+ Range: null,
+ Tag: "RequestPointNPSH",
+ Unit: 0,
+ UnitName: "m",
+ Value: "",
+ isShowPicker: false,
+ userUnit: [],
+ };
+ mainParaItemList.push(pointObj);
+ }
_this.MainParaItemList = mainParaItemList;
- // console.log(mainParaItemList, "mainParaItemList");
- let langType = _this.getCurrentLanguageUrl();
+ let langType = _this.getCurrentLanguageUrl();
let pointTable = {};
pointTable.title = `${this.$t("detailPage.parameterSelection.TR")}`;
pointTable.isShow = true;
pointTable.nodeList = [];
for (let i = 0; i < mainParaItemList.length; i++) {
let node = mainParaItemList[i];
- //鍒ゆ柇褰撳墠鏄笉鏄嫳鏂�
- if(langType == "EN"){
- node.Name = _this.getTranslateString(node.Name)
+ //鍒ゆ柇褰撳墠鏄笉鏄嫳鏂�
+ if (langType == "EN") {
+ node.Name = _this.getTranslateString(node.Name);
}
if (node.Tag == "RequestPointQ") {
node.userUnit = UnitHelper.Q_Value_List;
+ node.chartQueryPt = _this.m_query_pt_data.Q.value;
+ node.chartQueryPtTag = "ChartPointQueryQ";
} else if (node.Tag == "RequestPointH") {
node.userUnit = UnitHelper.H_Value_List;
- } else {
+ node.chartQueryPt = _this.m_query_pt_data.H.value;
+ node.chartQueryPtTag = "ChartPointQueryH";
+ } else if(node.Tag == "RequestPointE"){
+ node.userUnit = [];
+ node.chartQueryPt = _this.m_query_pt_data.E.value;
+ node.chartQueryPtTag = "ChartPointQueryE";
+ } else if(node.Tag == "RequestPointP"){
+ node.userUnit = [];
+ node.chartQueryPt = _this.m_query_pt_data.P.value;
+ node.chartQueryPtTag = "ChartPointQueryP";
+ }else if(node.Tag == "RequestPointNPSH"){
+ node.userUnit = [];
+ node.chartQueryPt = _this.m_query_pt_data.NPSH.value;
+ node.chartQueryPtTag = "ChartPointQueryNPSH";
+ }
+ else {
node.userUnit = [];
}
if (node.Tag == "MotorPower") {
@@ -158,12 +259,27 @@
//console.log(node, 602);
pointTable.nodeList.push(node);
}
- // console.log(pointTable, 661);
- pointTable.nodeList.forEach(item=>{
- item.isShowPicker = false
- })
- this.paraTable4Disp = pointTable
- // console.log(this.paraTable4Disp,158)
+ // console.log(pointTable, 661);
+ pointTable.nodeList.forEach((item) => {
+ item.isShowPicker = false;
+ });
+ this.paraTable4Disp = pointTable;
+ this.isFirstLoadingQueryPt = false;
+ // console.log(this.paraTable4Disp, 158);
+ },
+ //鏋勫缓鏌ヨ鍙傛暟
+ buildChartQueryData(query_pt) {
+ // console.log(query_pt, 799);
+
+ if (query_pt == null) {
+ return;
+ }
+
+ this.m_query_pt_data = query_pt;
+ // console.log("m_chartQueryData", this.m_query_pt_data);
+ if (!this.isFirstLoadingQueryPt) {
+ this.buildTable(this.MainParaItemList);
+ }
},
//淇敼璁捐鐐瑰弬鏁板悗 鍒锋柊
refreshPumpInfoData(val) {
@@ -184,7 +300,7 @@
getDesignParas() {
let obj = {};
let nodeList = this.paraTable4Disp.nodeList;
- nodeList.forEach(item => {
+ nodeList.forEach((item) => {
if (item.Tag == "RequestPointQ") {
//娴侀噺
obj.DpQ = item.Value;
@@ -238,11 +354,11 @@
}
this.paraTable4Disp = paraTable4Disp;
},
- showMotorValueComboxPicker(index,item) {
- this.currentShowPicker = [index]
- item.isShowPicker = !item.isShowPicker
+ showMotorValueComboxPicker(index, item) {
+ this.currentShowPicker = [index];
+ item.isShowPicker = !item.isShowPicker;
- this.$set(this.paraTable4Disp.nodeList, index, item)
+ this.$set(this.paraTable4Disp.nodeList, index, item);
},
getMotorValueList(index) {
let list = this.paraTable4Disp.nodeList[index].Range;
@@ -278,7 +394,7 @@
else if (cn == "鐢垫満鍔熺巼") return "Motor Power";
else return cn;
},
- }
+ },
};
</script>
<style lang="scss">
diff --git a/src/views/Select/SelSeries.vue b/src/views/Select/SelSeries.vue
index ce64797..ea69ad8 100644
--- a/src/views/Select/SelSeries.vue
+++ b/src/views/Select/SelSeries.vue
@@ -164,6 +164,7 @@
import languageMixin from "@/mixin/language.js";
export default {
+ name:"SelSeries",
mixins: [languageMixin],
data() {
return {
@@ -206,6 +207,10 @@
showPopover: false
};
},
+ activated() {
+ // keepalive缂撳瓨鐨勯〉闈㈡瘡娆¤繘鍏ラ兘浼氳繘琛岀殑鐢熷懡鍛ㄦ湡
+ console.log("keepalive缂撳瓨鐨勯〉闈㈡瘡娆¤繘鍏ラ兘浼氳繘琛岀殑鐢熷懡鍛ㄦ湡")
+ },
mounted() {
let _this = this;
let userType = this.$store.state.instante.account.UserType;
@@ -269,7 +274,7 @@
}
})
.then(res => {
- console.log(res);
+ // console.log(res);
let result = res.data;
if (result.Code != 0) {
myToast.clear();
@@ -442,13 +447,13 @@
changeSelectAllList(val) {
let SeriesID = [];
if (val) {
- this.m_SeriesList.forEach(node => {
+ this.m_VisibleSeriesList.forEach(node => {
node.isCheck = true;
SeriesID.push(node.ID);
});
this.m_SelectSeriesID = SeriesID;
} else {
- this.m_SeriesList.forEach(node => {
+ this.m_VisibleSeriesList.forEach(node => {
node.isCheck = false;
});
this.m_SelectSeriesID = [];
@@ -576,19 +581,11 @@
}
})
})
- console.log(showSeriesList,568)
+ // console.log(showSeriesList,568)
this.filterSeriesList(
showSeriesList,
this.m_pinlv
);
- // this.m_VisibleSeriesList = showSeriesList
- //鍒ゆ柇褰撳墠鏄惁鏄叏閫�
- // if(this.m_BrandValue.length != this.m_BrandColumns.length){
- // this.brandSelectAll = false
- // }else {
- // this.brandSelectAll = true
- // }
-
},
//鍏徃绛涢�夊垪琛ㄥ幓閲�
uniqueCorpList (arr) {
--
Gitblit v1.9.3