diff --git a/src/views/dike/safeMonitorSetting/index.vue b/src/views/dike/safeMonitorSetting/index.vue
index a2f9e02..ee5d62e 100644
--- a/src/views/dike/safeMonitorSetting/index.vue
+++ b/src/views/dike/safeMonitorSetting/index.vue
@@ -234,8 +234,8 @@ export default {
},
handleClickTree(data, node) {
console.log("handleClickTree >>>>> ", data, node);
- if (node.isLeaf) {
- console.log("点击叶子节点----加载水库列表 >>>> ");
+ if (node.isLeaf && data.layer < 3) {
+ console.log("点击叶子节点----加载测站列表 >>>> ");
this.tableData = [];
this.tabsList = [];
this.params.pageNum = 1;
diff --git a/src/views/dike/safeOperation/components/DataStatistics.vue b/src/views/dike/safeOperation/components/DataStatistics.vue
index 0001e49..3009738 100644
--- a/src/views/dike/safeOperation/components/DataStatistics.vue
+++ b/src/views/dike/safeOperation/components/DataStatistics.vue
@@ -21,12 +21,20 @@
end-placeholder="结束日期"
>
- 查询
-
+
指标
图表
@@ -63,21 +71,17 @@
@@ -182,47 +186,45 @@ export default {
options && chartInstance.setOption(options);
},
getEchartsData() {
- // 水库基本情况
+ // 1
getReservoirCZMonitorEchartsData({
startTime: this.dateArr ? this.dateArr[0] + " 00:00:00" : "",
endTime: this.dateArr ? this.dateArr[1] + " 23:59:59" : "",
resCode: this.resCode,
stcd: this.cascaderArr[0] || "",
mpcd: this.cascaderArr[1] || "",
- elementType: "WATER_LEVEL",
+ elementType: "C_SEEPAGE_FLOW",
}).then((res) => {
if (res.data) {
this.initChart(res.data, this.echart1, this.$refs.echarts1);
}
});
- // 环境情况
+ // 2
getReservoirCZMonitorEchartsData({
startTime: this.dateArr ? this.dateArr[0] + " 00:00:00" : "",
endTime: this.dateArr ? this.dateArr[1] + " 23:59:59" : "",
resCode: this.resCode,
stcd: this.cascaderArr[0] || "",
mpcd: this.cascaderArr[1] || "",
- elementType: "ENV",
+ elementType: "C_DISPLACEMENT",
}).then((res) => {
if (res.data) {
this.initChart(res.data, this.echart2, this.$refs.echarts2);
}
});
- // 应变应力
+ // 3
getReservoirCZMonitorEchartsData({
startTime: this.dateArr ? this.dateArr[0] + " 00:00:00" : "",
endTime: this.dateArr ? this.dateArr[1] + " 23:59:59" : "",
resCode: this.resCode,
stcd: this.cascaderArr[0] || "",
mpcd: this.cascaderArr[1] || "",
- elementType: "C_STRESS",
+ elementType: "DF_WATER_LEVEL",
}).then((res) => {
if (res.data) {
this.initChart(res.data, this.echart3, this.$refs.echarts3);
}
});
- // 渗流压力情况-没数据
- this.initChart([], this.echart4, this.$refs.echarts4);
},
handleSearch() {
this.attributesList = [];
@@ -332,6 +334,11 @@ export default {
border: 1px solid #f0f0f0;
}
}
+ .echarts-dom-box2 {
+ .echarts-dom {
+ width: 980px;
+ }
+ }
}
}
diff --git a/src/views/dike/safeOperation/index.vue b/src/views/dike/safeOperation/index.vue
index 5de9631..948b597 100644
--- a/src/views/dike/safeOperation/index.vue
+++ b/src/views/dike/safeOperation/index.vue
@@ -276,8 +276,8 @@ export default {
let tempName = name;
// devRun(() => {
// // tempCode = "440111000008";
- // // tempCode = "HP0174419000000566";
- // // tempName = "开发写死的名字";
+ // tempCode = "HP0174419000000566";
+ // tempName = "开发写死的名字";
// });
this.commonCode = tempCode;
this.commonName = tempName;
@@ -315,14 +315,14 @@ export default {
created() {
this.initData();
emitter.on("openDialog", this.openDialog);
- devRun(() => {
- setTimeout(() => {
- this.openDialog({
- code: "",
- name: "",
- });
- }, 1000);
- });
+ // devRun(() => {
+ // setTimeout(() => {
+ // this.openDialog({
+ // code: "",
+ // name: "",
+ // });
+ // }, 1000);
+ // });
},
mounted() {
setTimeout(() => {
diff --git a/src/views/reservoir/safeOperation/components/DataStatistics.vue b/src/views/reservoir/safeOperation/components/DataStatistics.vue
index ad33103..03bec82 100644
--- a/src/views/reservoir/safeOperation/components/DataStatistics.vue
+++ b/src/views/reservoir/safeOperation/components/DataStatistics.vue
@@ -21,12 +21,20 @@
end-placeholder="结束日期"
>
- 查询
-
+
指标
图表
diff --git a/src/views/reservoir/safeOperation/index.vue b/src/views/reservoir/safeOperation/index.vue
index cb49ee1..8f21b5e 100644
--- a/src/views/reservoir/safeOperation/index.vue
+++ b/src/views/reservoir/safeOperation/index.vue
@@ -313,14 +313,14 @@ export default {
created() {
this.initData();
emitter.on("openDialog", this.openDialog);
- devRun(() => {
- setTimeout(() => {
- this.openDialog({
- code: "",
- name: "",
- });
- }, 1000);
- });
+ // devRun(() => {
+ // setTimeout(() => {
+ // this.openDialog({
+ // code: "",
+ // name: "",
+ // });
+ // }, 1000);
+ // });
},
mounted() {
setTimeout(() => {
diff --git a/src/views/sluice/safeMonitorSetting/index.vue b/src/views/sluice/safeMonitorSetting/index.vue
index 4430509..ad16ae5 100644
--- a/src/views/sluice/safeMonitorSetting/index.vue
+++ b/src/views/sluice/safeMonitorSetting/index.vue
@@ -234,8 +234,8 @@ export default {
},
handleClickTree(data, node) {
console.log("handleClickTree >>>>> ", data, node);
- if (node.isLeaf) {
- console.log("点击叶子节点----加载水库列表 >>>> ");
+ if (node.isLeaf && data.layer < 3) {
+ console.log("点击叶子节点----加载测站列表 >>>> ");
this.tableData = [];
this.tabsList = [];
this.params.pageNum = 1;
diff --git a/src/views/sluice/safeOperation/components/BaseInfo.vue b/src/views/sluice/safeOperation/components/BaseInfo.vue
index 1f57960..49fae45 100644
--- a/src/views/sluice/safeOperation/components/BaseInfo.vue
+++ b/src/views/sluice/safeOperation/components/BaseInfo.vue
@@ -1,8 +1,8 @@
-
- 水库基本信息
+
+ 基本信息
- 水库名称
- {{ this.form.resName }}
+ 水闸名称
+ {{ this.form.wagaName }}
- 水库代码
- {{ this.form.resCode }}
+ 水闸代码
+ {{ this.form.wagaCode }}
- 水库注册登记号
- {{ this.form.registerCode }}
-
-
- 水库功能
- {{ this.form.resAction }}
-
-
- 水库类型
- {{ this.form.resType }}
-
-
- 水库状态
- {{ this.form.resState }}
+ 水闸类型
+ {{ this.form.wagaType }}
+
+
+
+
+
+
+
+
工程规模
{{ this.form.engScal }}
+
+ 水闸所在位置
+ {{ this.form.wagaLoc }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
工程等别
{{ this.form.engGrad }}
-
- 曾用名
- {{ this.form.oldName }}
-
-
- 水库中心经度
- {{ this.form.resCenLong }}
-
-
- 水库中心纬度
- {{ this.form.resCenLat }}
-
-
- 归口管理部门
- {{ this.form.admDep }}
-
-
- 水库主管部门
- {{ this.form.cmun }}
-
-
- 水库管理部门
- {{ "" }}
-
-
- 所在行政区划
- {{ "" }}
-
-
- 所在流域
- {{ this.form.localBasin }}
-
-
- 所在河流
- {{ this.form.localRiver }}
-
-
- 水准基面
- {{ "" }}
-
-
- 是否注册
- {{ "" }}
-
-
- 左下角经度
- {{ "" }}
-
-
- 左下角纬度
- {{ "" }}
-
-
- 右上角经度
- {{ "" }}
-
-
- 右上角纬度
- {{ "" }}
-
-
- 水库所在位置
- {{ this.form.resLoc }}
-
-
- 水库管理单位
- {{ this.form.mnun }}
-
-
- 工程建设情况
- {{ this.form.engStat }}
-
-
- 有效年份
- {{ "" }}
-
主要建筑物级别
- {{ "" }}
-
-
- 控制流域面积
- {{ this.form.watShedArea }}
-
-
- 河道长度
- {{ "" }}
-
-
- 河道比降
- {{ "" }}
-
-
- 多年平均径流量
- {{ this.form.avanrnam }}
-
-
- 多年平均降水量
- {{ this.form.avanpram }}
-
-
- 多年平均流沙量
- {{ this.form.avansdam }}
-
-
- 设计重现期
- {{ this.form.dsrcin }}
-
-
- 设计洪峰流量
- {{ this.form.dspkfl }}
-
-
- 设计1日洪水洪量(万m³)
- {{ "" }}
-
-
- 设计3日洪水洪量(万m³)
- {{ "" }}
-
-
- 校核重现期
- {{ this.form.chrcin }}
-
-
- 校核洪峰流量
- {{ this.form.chpkfl }}
-
-
- 校核洪水历时
- {{ "" }}
-
-
- 校核洪水总量
- {{ this.form.chflvl }}
-
-
- 设计洪水位
- {{ this.form.dsfllv }}
-
-
- 校核洪水位
- {{ this.form.chfllv }}
-
-
- 防洪高水位
- {{ this.form.uppLevFlco }}
-
-
- 防洪限制水位库容
- {{ this.form.flLowLimLevCap }}
-
-
- 正常蓄水位
- {{ this.form.normWatLev }}
-
-
- 正常蓄水位相应水面面积
- {{ "" }}
-
-
- 正常蓄水位相应库容
- {{ this.form.normPoolStagCap }}
-
-
- 死水位
- {{ this.form.deadLev }}
-
+ {{ this.form.mainBuildGrad }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 总库容
- {{ this.form.totCap }}
+ 水准基面
+ {{ this.form.levelDatum }}
- 调节库容
- {{ this.form.storFlCap }}
+ 水闸概况
+ {{ this.form.sluiceOverview }}
- 死库容
- {{ this.form.deadCap }}
+ 水闸中心经度
+ {{ this.form.wagaCenLong }}
- 防洪库容
- {{ this.form.flcoCap }}
+ 水闸中心纬度
+ {{ this.form.wagaCenLat }}
- 兴利库容
- {{ "" }}
+ 是否穿堤水闸
+ {{ this.form.ifCeb }}
- 坝址控制流域面积
- {{ this.form.watShedArea }}
+ 是否为枢纽工程
+ {{ this.form.ifHyj }}
- 地震基本烈度
- {{ "" }}
+ 是否为闸站工程
+ {{ this.form.ifGse }}
- 地震动峰值加速度
- {{ "" }}
-
+ 是否为套闸工程
+ {{ this.form.ifSge }} .
- 设防地震烈度
- {{ "" }}
+ 设计地震烈度
+ {{ this.form.freqin }}
- 集雨面积
- {{ "" }}
+ 建成时间
+ {{ this.form.compDate }}
- 下泄生态流量
- {{ "" }}
+ 竣工验收时间
+ {{ this.form.checkDate }}
- 数据来源
- {{ "" }}
+ 管理部门
+ {{ this.form.mnun }}
- 数据创建时间
- {{ this.form.createTime }}
+ 归口管理部门
+ {{ this.form.admDep }}
- 备注
+ 备注
{{ this.form.note }}
-
-
-
- 水库概况
- {{ this.form.resOv }}
-
-
- 水库建设时间
-
-
- 开工时间
- {{ this.form.startDate }}
-
-
- 完工时间
- {{ this.form.compDate }}
-
-
- 最近异常加固改造时间
-
- 更新时间
- {{ this.form.updateTime }}
+ 记录更新时间
+ {{ this.form.updateDate }}
- 水库水文特征
+ 水文特征
- 控制流域面积(km²)
- {{ this.form.watShedArea }}
-
-
- 多年平均降雨量(mm)
- {{ this.form.avanpram }}
-
-
- 多年平均径流量(万m³)
- {{ this.form.avanrnam }}
-
-
- 多年平均输沙两(万t)
- {{ this.form.avansdam }}
-
-
- 多年平均最低气温(℃)
- {{ this.form.myavgmintp }}
-
-
- 多年平均蒸发量(mm)
- {{ this.form.avanev }}
-
-
- 多年平均含沙量(kg/m³)
- {{ "" }}
-
-
- 水库调节性能
- {{ "" }}
-
-
- 正常蓄水位相应水面面积(km²)
- {{ "" }}
-
-
- 防洪高水位(m)
- {{ this.form.uppLevFlco }}
-
-
- 死水位(m)
- {{ this.form.deadLev }}
-
-
- 橙色预警水位(m)
- {{ "" }}
-
-
- 红色预警水位(m)
- {{ "" }}
+ 河道宽度（m）
+ {{ this.form.riverWidth }}
- 黄色预警水位(m)
- {{ "" }}
+ 河道比降（%）
+ {{ this.form.riverGradient }}
- 汛期开始日期
- {{ "" }}
+ 多年平均径流量（万m³）
+ {{ this.form.annualAverageRunoff }}
- 汛期结束日期
- {{ "" }}
+ 多年平均输沙量（万t）
+ {{ this.form.averageSedimentTransport }}
- 水准基面
- {{ "" }}
+ 多年平均最低气温（℃）
+ {{ this.form.averageMinimumTemperature }}
- 备注
- {{ this.form.note }}
-
-
- 设计洪水
-
-
- 校核洪峰流量(m³/s)
- {{ this.form.chpkfl }}
-
-
- 设计洪峰流量(m³/s)
- {{ this.form.dspkfl }}
-
-
- 设计洪水位(m)
- {{ this.form.dsfllv }}
-
-
- 校核洪水位(m)
- {{ this.form.chfllv }}
-
-
- 设计1日洪水洪量(万m³)
- {{ "" }}
+ 设计重现期（年一遇）
+ {{ this.form.dsrcin }}
- 设计3日洪水洪量(万m³)
- {{ "" }}
+ 设计洪峰流量（m³/s）
+ {{ this.form.peakFlowRate }}
- 校核洪水历时(d)
- {{ "" }}
+ 校核重现期（年一遇）
+ {{ this.form.chrcin }}
- 洪水总量
- {{ "" }}
-
-
- 汛期限制水位
-
-
- 设计重现期
+ 校核洪峰流量（m³/s）
{{ this.form.dsrcin }}
- 河道比降
- {{ "" }}
-
-
- 河道长度
- {{ "" }}
+ 设计过闸流量（m³）
+ {{ this.form.dslcfl }}
- 汛期限制水位主汛期
- {{ "" }}
-
-
- 库容
-
-
- 兴利库容
- {{ "" }}
+ 设计闸上水位（m）
+ {{ this.form.dsuswl }}
+
- 总库容(m³)
- {{ this.form.totCap }}
+ 设计闸下水位（m）
+ {{ this.form.dsdswl }}
- 防洪库容(m³)
- {{ this.form.flcoCap }}
+ 校核过闸流量（m³）
+ {{ this.form.chlcfl }}
- 调节库容(m³)
- {{ this.form.storFlCap }}
+ 校核闸上水位（m）
+ {{ this.form.chuswl }}
- 死库容(m³)
- {{ this.form.deadCap }}
+ 校核闸下水位（m）
+ {{ this.form.chdswl }}
@@ -553,6 +274,17 @@ import {
getReservoirRsppDetailData,
} from "@/api/reservoir";
+import { getJbxx } from "@/api/yg/jbxx";
+
+import {
+ listSwtz,
+ getSwtz,
+ delSwtz,
+ addSwtz,
+ updateSwtz,
+ exportSwtz,
+} from "@/api/yg/swtz";
+
export default {
props: {
resCode: {
@@ -604,7 +336,7 @@ export default {
},
methods: {
initBaseInfo() {
- getReservoirBaseDetailData(this.resCode).then((res) => {
+ getJbxx(this.resCode).then((res) => {
if (res?.data) {
this.form = {
...this.form,
@@ -615,11 +347,15 @@ export default {
});
},
initRsppInfo() {
- getReservoirRsppDetailData(this.resCode).then((res) => {
- if (res?.data) {
- Object.keys(res.data).forEach((key) => {
- this.form[key] = res.data[key];
- });
+ listSwtz({
+ pageNum: 1,
+ pageSize: 10,
+ data: {
+ wagaId: this.resCode,
+ },
+ }).then((res) => {
+ if (res?.records) {
+ Object.assign(this.form, res.records[0] || {});
}
});
},
diff --git a/src/views/sluice/safeOperation/components/DataStatistics.vue b/src/views/sluice/safeOperation/components/DataStatistics.vue
index c3eb620..fb21c17 100644
--- a/src/views/sluice/safeOperation/components/DataStatistics.vue
+++ b/src/views/sluice/safeOperation/components/DataStatistics.vue
@@ -21,12 +21,20 @@
end-placeholder="结束日期"
>
- 查询
-
+
指标
图表
@@ -62,22 +70,18 @@
@@ -181,40 +185,40 @@ export default {
options && chartInstance.setOption(options);
},
getEchartsData() {
- // 水库基本情况
+ // 1
getReservoirCZMonitorEchartsData({
startTime: this.dateArr ? this.dateArr[0] + " 00:00:00" : "",
endTime: this.dateArr ? this.dateArr[1] + " 23:59:59" : "",
resCode: this.resCode,
stcd: this.cascaderArr[0] || "",
mpcd: this.cascaderArr[1] || "",
- elementType: "WATER_LEVEL",
+ elementType: "SZ_SEEPAGE_AROUND",
}).then((res) => {
if (res.data) {
this.initChart(res.data, this.echart1, this.$refs.echarts1);
}
});
- // 环境情况
+ // 2
getReservoirCZMonitorEchartsData({
startTime: this.dateArr ? this.dateArr[0] + " 00:00:00" : "",
endTime: this.dateArr ? this.dateArr[1] + " 23:59:59" : "",
resCode: this.resCode,
stcd: this.cascaderArr[0] || "",
mpcd: this.cascaderArr[1] || "",
- elementType: "ENV",
+ elementType: "SZ_WATER_LEVEL",
}).then((res) => {
if (res.data) {
this.initChart(res.data, this.echart2, this.$refs.echarts2);
}
});
- // 应变应力
+ // 3
getReservoirCZMonitorEchartsData({
startTime: this.dateArr ? this.dateArr[0] + " 00:00:00" : "",
endTime: this.dateArr ? this.dateArr[1] + " 23:59:59" : "",
resCode: this.resCode,
stcd: this.cascaderArr[0] || "",
mpcd: this.cascaderArr[1] || "",
- elementType: "C_STRESS",
+ elementType: "SZ_DISPLACEMENT",
}).then((res) => {
if (res.data) {
this.initChart(res.data, this.echart3, this.$refs.echarts3);
@@ -304,7 +308,7 @@ export default {
flex-wrap: wrap;
.echarts-dom-box {
margin-bottom: 24px;
- &:nth-child(2n) {
+ &:nth-child(1n) {
margin-left: 24px;
}
.title {
@@ -331,6 +335,11 @@ export default {
border: 1px solid #f0f0f0;
}
}
+ .echarts-dom-box2 {
+ .echarts-dom {
+ width: 980px;
+ }
+ }
}
}
diff --git a/src/views/sluice/safeOperation/index.vue b/src/views/sluice/safeOperation/index.vue
index d94e603..fa970e4 100644
--- a/src/views/sluice/safeOperation/index.vue
+++ b/src/views/sluice/safeOperation/index.vue
@@ -274,11 +274,10 @@ export default {
console.log("打开弹窗获取resCode >>>>> ", code, name);
let tempCode = code;
let tempName = name;
- devRun(() => {
- // tempCode = "440111000008";
- tempCode = "HP0014412260000437";
- tempName = "开发写死的名字";
- });
+ // devRun(() => {
+ // // tempCode = "HP007445221000001X";
+ // // tempName = "开发写死的名字";
+ // });
this.commonResCode = tempCode;
this.commonResName = tempName;
this.showDialog = true;
@@ -315,14 +314,14 @@ export default {
created() {
this.initData();
emitter.on("openDialog", this.openDialog);
- devRun(() => {
- setTimeout(() => {
- this.openDialog({
- code: "",
- name: "",
- });
- }, 1000);
- });
+ // devRun(() => {
+ // setTimeout(() => {
+ // this.openDialog({
+ // code: "",
+ // name: "",
+ // });
+ // }, 1000);
+ // });
},
mounted() {
setTimeout(() => {