diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js index cb24476..9654e06 100644 --- a/src/api/spongePerformance/naturalWaterArea.js +++ b/src/api/spongePerformance/naturalWaterArea.js @@ -46,11 +46,18 @@ // 可透水地面面积积详情列表 export const kstdmAreaByYear = params => { return request({ - url: `/sponge/performanceEvaluate/kstdmAreaByYear`, + url: `/sponge/performanceResultTspumj/list`, method: 'get', params, }); }; +// export const kstdmAreaByYear = params => { +// return request({ +// url: `/sponge/performanceEvaluate/kstdmAreaByYear`, +// method: 'get', +// params, +// }); +// }; // 业务分页搜索海绵考核评估项数据类型 export const yszylyDetailList = params => { return request({ diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js index cb24476..9654e06 100644 --- a/src/api/spongePerformance/naturalWaterArea.js +++ b/src/api/spongePerformance/naturalWaterArea.js @@ -46,11 +46,18 @@ // 可透水地面面积积详情列表 export const kstdmAreaByYear = params => { return request({ - url: `/sponge/performanceEvaluate/kstdmAreaByYear`, + url: `/sponge/performanceResultTspumj/list`, method: 'get', params, }); }; +// export const kstdmAreaByYear = params => { +// return request({ +// url: `/sponge/performanceEvaluate/kstdmAreaByYear`, +// method: 'get', +// params, +// }); +// }; // 业务分页搜索海绵考核评估项数据类型 export const yszylyDetailList = params => { return request({ diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index f382cba..c7534aa 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -98,7 +98,7 @@ if (!file) return; window.open(file.url); documentAccessRecordAdd({ - fileId: row.id, + fileId: row.fileId, }); }; diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js index cb24476..9654e06 100644 --- a/src/api/spongePerformance/naturalWaterArea.js +++ b/src/api/spongePerformance/naturalWaterArea.js @@ -46,11 +46,18 @@ // 可透水地面面积积详情列表 export const kstdmAreaByYear = params => { return request({ - url: `/sponge/performanceEvaluate/kstdmAreaByYear`, + url: `/sponge/performanceResultTspumj/list`, method: 'get', params, }); }; +// export const kstdmAreaByYear = params => { +// return request({ +// url: `/sponge/performanceEvaluate/kstdmAreaByYear`, +// method: 'get', +// params, +// }); +// }; // 业务分页搜索海绵考核评估项数据类型 export const yszylyDetailList = params => { return request({ diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index f382cba..c7534aa 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -98,7 +98,7 @@ if (!file) return; window.open(file.url); documentAccessRecordAdd({ - fileId: row.id, + fileId: row.fileId, }); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index fa31e23..84c53c5 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -219,7 +219,7 @@ height: 476px; background-image: url('@/assets/newImgs/layer1.png'); background-size: 100% 100%; - z-index: 115; + z-index: 1150; position: absolute; top: 80px; left: 530px; diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js index cb24476..9654e06 100644 --- a/src/api/spongePerformance/naturalWaterArea.js +++ b/src/api/spongePerformance/naturalWaterArea.js @@ -46,11 +46,18 @@ // 可透水地面面积积详情列表 export const kstdmAreaByYear = params => { return request({ - url: `/sponge/performanceEvaluate/kstdmAreaByYear`, + url: `/sponge/performanceResultTspumj/list`, method: 'get', params, }); }; +// export const kstdmAreaByYear = params => { +// return request({ +// url: `/sponge/performanceEvaluate/kstdmAreaByYear`, +// method: 'get', +// params, +// }); +// }; // 业务分页搜索海绵考核评估项数据类型 export const yszylyDetailList = params => { return request({ diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index f382cba..c7534aa 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -98,7 +98,7 @@ if (!file) return; window.open(file.url); documentAccessRecordAdd({ - fileId: row.id, + fileId: row.fileId, }); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index fa31e23..84c53c5 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -219,7 +219,7 @@ height: 476px; background-image: url('@/assets/newImgs/layer1.png'); background-size: 100% 100%; - z-index: 115; + z-index: 1150; position: absolute; top: 80px; left: 530px; diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue index a3af685..cc788a6 100644 --- a/src/views/floodSys/floodOneMap/tabRightWL.vue +++ b/src/views/floodSys/floodOneMap/tabRightWL.vue @@ -534,54 +534,54 @@ }; //获取管网监测统计分析 const getSuperVisePipeData = async () => { - let params = { - startTime: allData.pipeTime[0], - endTime: allData.pipeTime[1], - stCode: allData.supervisePipeCode, - }; - let res = await graphicReport(params); - if (res && res.code == 200) { - let datas = res.data; - if (!!!datas) return; - if (datas.propertyMonitorList.length > 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [ - datas.propertyMonitorList[2].monitorPropertyName, - datas.propertyMonitorList[0].monitorPropertyName, - ]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorList.length == 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorXList.length == 0) { - chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 - chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; - chartOption.floodOneMapPipeSupervise.series[0].data = []; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = ''; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - } - // 设置鼠标滚轮放大缩小展示数据区间 - chartOption.floodOneMapPipeSupervise.dataZoom = [ - { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, - ]; - initPipeChart(); - } + // let params = { + // startTime: allData.pipeTime[0], + // endTime: allData.pipeTime[1], + // stCode: allData.supervisePipeCode, + // }; + // let res = await graphicReport(params); + // if (res && res.code == 200) { + // let datas = res.data; + // if (!!!datas) return; + // if (datas.propertyMonitorList.length > 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [ + // datas.propertyMonitorList[2].monitorPropertyName, + // datas.propertyMonitorList[0].monitorPropertyName, + // ]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorList.length == 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorXList.length == 0) { + // chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = ''; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // } + // // 设置鼠标滚轮放大缩小展示数据区间 + // chartOption.floodOneMapPipeSupervise.dataZoom = [ + // { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, + // ]; + // initPipeChart(); + // } }; //管网监测趋势图 let pipeChart = null; @@ -810,24 +810,24 @@ const tableData6 = ref([]); const tableData71 = ref([]); const tableRef71 = ref(null); -const tableLoading71 = ref(true); +// const tableLoading71 = ref(true); //获取源头地块 const getOrinignList = async () => { - tableLoading71.value = true; - let res = await orinignList(); - if (res && res.code == 200) { - let data = res.data; - let params = data[0].stCodes; - let res1 = await orinignDataList(params); - if (res1 && res1.code == 200) { - tableData71.value = res1.data; - tableData71.value.forEach((item, index) => { - item.dataTime = res1.data[index].monitorValueList[0].tt; - }); - tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 - tableLoading71.value = false; - } - } + // tableLoading71.value = true; + // let res = await orinignList(); + // if (res && res.code == 200) { + // let data = res.data; + // let params = data[0].stCodes; + // let res1 = await orinignDataList(params); + // if (res1 && res1.code == 200) { + // tableData71.value = res1.data; + // tableData71.value.forEach((item, index) => { + // item.dataTime = res1.data[index].monitorValueList[0].tt; + // }); + // tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 + // tableLoading71.value = false; + // } + // } }; const tableData7 = ref([]); //获取厂站概况 diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js index cb24476..9654e06 100644 --- a/src/api/spongePerformance/naturalWaterArea.js +++ b/src/api/spongePerformance/naturalWaterArea.js @@ -46,11 +46,18 @@ // 可透水地面面积积详情列表 export const kstdmAreaByYear = params => { return request({ - url: `/sponge/performanceEvaluate/kstdmAreaByYear`, + url: `/sponge/performanceResultTspumj/list`, method: 'get', params, }); }; +// export const kstdmAreaByYear = params => { +// return request({ +// url: `/sponge/performanceEvaluate/kstdmAreaByYear`, +// method: 'get', +// params, +// }); +// }; // 业务分页搜索海绵考核评估项数据类型 export const yszylyDetailList = params => { return request({ diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index f382cba..c7534aa 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -98,7 +98,7 @@ if (!file) return; window.open(file.url); documentAccessRecordAdd({ - fileId: row.id, + fileId: row.fileId, }); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index fa31e23..84c53c5 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -219,7 +219,7 @@ height: 476px; background-image: url('@/assets/newImgs/layer1.png'); background-size: 100% 100%; - z-index: 115; + z-index: 1150; position: absolute; top: 80px; left: 530px; diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue index a3af685..cc788a6 100644 --- a/src/views/floodSys/floodOneMap/tabRightWL.vue +++ b/src/views/floodSys/floodOneMap/tabRightWL.vue @@ -534,54 +534,54 @@ }; //获取管网监测统计分析 const getSuperVisePipeData = async () => { - let params = { - startTime: allData.pipeTime[0], - endTime: allData.pipeTime[1], - stCode: allData.supervisePipeCode, - }; - let res = await graphicReport(params); - if (res && res.code == 200) { - let datas = res.data; - if (!!!datas) return; - if (datas.propertyMonitorList.length > 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [ - datas.propertyMonitorList[2].monitorPropertyName, - datas.propertyMonitorList[0].monitorPropertyName, - ]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorList.length == 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorXList.length == 0) { - chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 - chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; - chartOption.floodOneMapPipeSupervise.series[0].data = []; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = ''; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - } - // 设置鼠标滚轮放大缩小展示数据区间 - chartOption.floodOneMapPipeSupervise.dataZoom = [ - { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, - ]; - initPipeChart(); - } + // let params = { + // startTime: allData.pipeTime[0], + // endTime: allData.pipeTime[1], + // stCode: allData.supervisePipeCode, + // }; + // let res = await graphicReport(params); + // if (res && res.code == 200) { + // let datas = res.data; + // if (!!!datas) return; + // if (datas.propertyMonitorList.length > 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [ + // datas.propertyMonitorList[2].monitorPropertyName, + // datas.propertyMonitorList[0].monitorPropertyName, + // ]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorList.length == 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorXList.length == 0) { + // chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = ''; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // } + // // 设置鼠标滚轮放大缩小展示数据区间 + // chartOption.floodOneMapPipeSupervise.dataZoom = [ + // { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, + // ]; + // initPipeChart(); + // } }; //管网监测趋势图 let pipeChart = null; @@ -810,24 +810,24 @@ const tableData6 = ref([]); const tableData71 = ref([]); const tableRef71 = ref(null); -const tableLoading71 = ref(true); +// const tableLoading71 = ref(true); //获取源头地块 const getOrinignList = async () => { - tableLoading71.value = true; - let res = await orinignList(); - if (res && res.code == 200) { - let data = res.data; - let params = data[0].stCodes; - let res1 = await orinignDataList(params); - if (res1 && res1.code == 200) { - tableData71.value = res1.data; - tableData71.value.forEach((item, index) => { - item.dataTime = res1.data[index].monitorValueList[0].tt; - }); - tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 - tableLoading71.value = false; - } - } + // tableLoading71.value = true; + // let res = await orinignList(); + // if (res && res.code == 200) { + // let data = res.data; + // let params = data[0].stCodes; + // let res1 = await orinignDataList(params); + // if (res1 && res1.code == 200) { + // tableData71.value = res1.data; + // tableData71.value.forEach((item, index) => { + // item.dataTime = res1.data[index].monitorValueList[0].tt; + // }); + // tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 + // tableLoading71.value = false; + // } + // } }; const tableData7 = ref([]); //获取厂站概况 diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue index be44d99..b50387c 100644 --- a/src/views/floodSys/floodOneMap/tabSelect.vue +++ b/src/views/floodSys/floodOneMap/tabSelect.vue @@ -239,7 +239,7 @@ bottom: 1%; left: 450px; position: absolute; - z-index: 115; + z-index: 1150; .changeTab { width: 175px; height: 43px; diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js index cb24476..9654e06 100644 --- a/src/api/spongePerformance/naturalWaterArea.js +++ b/src/api/spongePerformance/naturalWaterArea.js @@ -46,11 +46,18 @@ // 可透水地面面积积详情列表 export const kstdmAreaByYear = params => { return request({ - url: `/sponge/performanceEvaluate/kstdmAreaByYear`, + url: `/sponge/performanceResultTspumj/list`, method: 'get', params, }); }; +// export const kstdmAreaByYear = params => { +// return request({ +// url: `/sponge/performanceEvaluate/kstdmAreaByYear`, +// method: 'get', +// params, +// }); +// }; // 业务分页搜索海绵考核评估项数据类型 export const yszylyDetailList = params => { return request({ diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index f382cba..c7534aa 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -98,7 +98,7 @@ if (!file) return; window.open(file.url); documentAccessRecordAdd({ - fileId: row.id, + fileId: row.fileId, }); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index fa31e23..84c53c5 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -219,7 +219,7 @@ height: 476px; background-image: url('@/assets/newImgs/layer1.png'); background-size: 100% 100%; - z-index: 115; + z-index: 1150; position: absolute; top: 80px; left: 530px; diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue index a3af685..cc788a6 100644 --- a/src/views/floodSys/floodOneMap/tabRightWL.vue +++ b/src/views/floodSys/floodOneMap/tabRightWL.vue @@ -534,54 +534,54 @@ }; //获取管网监测统计分析 const getSuperVisePipeData = async () => { - let params = { - startTime: allData.pipeTime[0], - endTime: allData.pipeTime[1], - stCode: allData.supervisePipeCode, - }; - let res = await graphicReport(params); - if (res && res.code == 200) { - let datas = res.data; - if (!!!datas) return; - if (datas.propertyMonitorList.length > 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [ - datas.propertyMonitorList[2].monitorPropertyName, - datas.propertyMonitorList[0].monitorPropertyName, - ]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorList.length == 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorXList.length == 0) { - chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 - chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; - chartOption.floodOneMapPipeSupervise.series[0].data = []; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = ''; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - } - // 设置鼠标滚轮放大缩小展示数据区间 - chartOption.floodOneMapPipeSupervise.dataZoom = [ - { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, - ]; - initPipeChart(); - } + // let params = { + // startTime: allData.pipeTime[0], + // endTime: allData.pipeTime[1], + // stCode: allData.supervisePipeCode, + // }; + // let res = await graphicReport(params); + // if (res && res.code == 200) { + // let datas = res.data; + // if (!!!datas) return; + // if (datas.propertyMonitorList.length > 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [ + // datas.propertyMonitorList[2].monitorPropertyName, + // datas.propertyMonitorList[0].monitorPropertyName, + // ]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorList.length == 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorXList.length == 0) { + // chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = ''; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // } + // // 设置鼠标滚轮放大缩小展示数据区间 + // chartOption.floodOneMapPipeSupervise.dataZoom = [ + // { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, + // ]; + // initPipeChart(); + // } }; //管网监测趋势图 let pipeChart = null; @@ -810,24 +810,24 @@ const tableData6 = ref([]); const tableData71 = ref([]); const tableRef71 = ref(null); -const tableLoading71 = ref(true); +// const tableLoading71 = ref(true); //获取源头地块 const getOrinignList = async () => { - tableLoading71.value = true; - let res = await orinignList(); - if (res && res.code == 200) { - let data = res.data; - let params = data[0].stCodes; - let res1 = await orinignDataList(params); - if (res1 && res1.code == 200) { - tableData71.value = res1.data; - tableData71.value.forEach((item, index) => { - item.dataTime = res1.data[index].monitorValueList[0].tt; - }); - tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 - tableLoading71.value = false; - } - } + // tableLoading71.value = true; + // let res = await orinignList(); + // if (res && res.code == 200) { + // let data = res.data; + // let params = data[0].stCodes; + // let res1 = await orinignDataList(params); + // if (res1 && res1.code == 200) { + // tableData71.value = res1.data; + // tableData71.value.forEach((item, index) => { + // item.dataTime = res1.data[index].monitorValueList[0].tt; + // }); + // tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 + // tableLoading71.value = false; + // } + // } }; const tableData7 = ref([]); //获取厂站概况 diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue index be44d99..b50387c 100644 --- a/src/views/floodSys/floodOneMap/tabSelect.vue +++ b/src/views/floodSys/floodOneMap/tabSelect.vue @@ -239,7 +239,7 @@ bottom: 1%; left: 450px; position: absolute; - z-index: 115; + z-index: 1150; .changeTab { width: 175px; height: 43px; diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 3548f11..6521b57 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -86,8 +86,8 @@ - - + + diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js index cb24476..9654e06 100644 --- a/src/api/spongePerformance/naturalWaterArea.js +++ b/src/api/spongePerformance/naturalWaterArea.js @@ -46,11 +46,18 @@ // 可透水地面面积积详情列表 export const kstdmAreaByYear = params => { return request({ - url: `/sponge/performanceEvaluate/kstdmAreaByYear`, + url: `/sponge/performanceResultTspumj/list`, method: 'get', params, }); }; +// export const kstdmAreaByYear = params => { +// return request({ +// url: `/sponge/performanceEvaluate/kstdmAreaByYear`, +// method: 'get', +// params, +// }); +// }; // 业务分页搜索海绵考核评估项数据类型 export const yszylyDetailList = params => { return request({ diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index f382cba..c7534aa 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -98,7 +98,7 @@ if (!file) return; window.open(file.url); documentAccessRecordAdd({ - fileId: row.id, + fileId: row.fileId, }); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index fa31e23..84c53c5 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -219,7 +219,7 @@ height: 476px; background-image: url('@/assets/newImgs/layer1.png'); background-size: 100% 100%; - z-index: 115; + z-index: 1150; position: absolute; top: 80px; left: 530px; diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue index a3af685..cc788a6 100644 --- a/src/views/floodSys/floodOneMap/tabRightWL.vue +++ b/src/views/floodSys/floodOneMap/tabRightWL.vue @@ -534,54 +534,54 @@ }; //获取管网监测统计分析 const getSuperVisePipeData = async () => { - let params = { - startTime: allData.pipeTime[0], - endTime: allData.pipeTime[1], - stCode: allData.supervisePipeCode, - }; - let res = await graphicReport(params); - if (res && res.code == 200) { - let datas = res.data; - if (!!!datas) return; - if (datas.propertyMonitorList.length > 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [ - datas.propertyMonitorList[2].monitorPropertyName, - datas.propertyMonitorList[0].monitorPropertyName, - ]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorList.length == 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorXList.length == 0) { - chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 - chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; - chartOption.floodOneMapPipeSupervise.series[0].data = []; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = ''; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - } - // 设置鼠标滚轮放大缩小展示数据区间 - chartOption.floodOneMapPipeSupervise.dataZoom = [ - { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, - ]; - initPipeChart(); - } + // let params = { + // startTime: allData.pipeTime[0], + // endTime: allData.pipeTime[1], + // stCode: allData.supervisePipeCode, + // }; + // let res = await graphicReport(params); + // if (res && res.code == 200) { + // let datas = res.data; + // if (!!!datas) return; + // if (datas.propertyMonitorList.length > 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [ + // datas.propertyMonitorList[2].monitorPropertyName, + // datas.propertyMonitorList[0].monitorPropertyName, + // ]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorList.length == 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorXList.length == 0) { + // chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = ''; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // } + // // 设置鼠标滚轮放大缩小展示数据区间 + // chartOption.floodOneMapPipeSupervise.dataZoom = [ + // { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, + // ]; + // initPipeChart(); + // } }; //管网监测趋势图 let pipeChart = null; @@ -810,24 +810,24 @@ const tableData6 = ref([]); const tableData71 = ref([]); const tableRef71 = ref(null); -const tableLoading71 = ref(true); +// const tableLoading71 = ref(true); //获取源头地块 const getOrinignList = async () => { - tableLoading71.value = true; - let res = await orinignList(); - if (res && res.code == 200) { - let data = res.data; - let params = data[0].stCodes; - let res1 = await orinignDataList(params); - if (res1 && res1.code == 200) { - tableData71.value = res1.data; - tableData71.value.forEach((item, index) => { - item.dataTime = res1.data[index].monitorValueList[0].tt; - }); - tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 - tableLoading71.value = false; - } - } + // tableLoading71.value = true; + // let res = await orinignList(); + // if (res && res.code == 200) { + // let data = res.data; + // let params = data[0].stCodes; + // let res1 = await orinignDataList(params); + // if (res1 && res1.code == 200) { + // tableData71.value = res1.data; + // tableData71.value.forEach((item, index) => { + // item.dataTime = res1.data[index].monitorValueList[0].tt; + // }); + // tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 + // tableLoading71.value = false; + // } + // } }; const tableData7 = ref([]); //获取厂站概况 diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue index be44d99..b50387c 100644 --- a/src/views/floodSys/floodOneMap/tabSelect.vue +++ b/src/views/floodSys/floodOneMap/tabSelect.vue @@ -239,7 +239,7 @@ bottom: 1%; left: 450px; position: absolute; - z-index: 115; + z-index: 1150; .changeTab { width: 175px; height: 43px; diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 3548f11..6521b57 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -86,8 +86,8 @@ - - + + diff --git a/src/views/longoPeration/LSCaseIssues.vue b/src/views/longoPeration/LSCaseIssues.vue index eefff4b..5405074 100644 --- a/src/views/longoPeration/LSCaseIssues.vue +++ b/src/views/longoPeration/LSCaseIssues.vue @@ -85,7 +85,7 @@ - + diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js index cb24476..9654e06 100644 --- a/src/api/spongePerformance/naturalWaterArea.js +++ b/src/api/spongePerformance/naturalWaterArea.js @@ -46,11 +46,18 @@ // 可透水地面面积积详情列表 export const kstdmAreaByYear = params => { return request({ - url: `/sponge/performanceEvaluate/kstdmAreaByYear`, + url: `/sponge/performanceResultTspumj/list`, method: 'get', params, }); }; +// export const kstdmAreaByYear = params => { +// return request({ +// url: `/sponge/performanceEvaluate/kstdmAreaByYear`, +// method: 'get', +// params, +// }); +// }; // 业务分页搜索海绵考核评估项数据类型 export const yszylyDetailList = params => { return request({ diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index f382cba..c7534aa 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -98,7 +98,7 @@ if (!file) return; window.open(file.url); documentAccessRecordAdd({ - fileId: row.id, + fileId: row.fileId, }); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index fa31e23..84c53c5 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -219,7 +219,7 @@ height: 476px; background-image: url('@/assets/newImgs/layer1.png'); background-size: 100% 100%; - z-index: 115; + z-index: 1150; position: absolute; top: 80px; left: 530px; diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue index a3af685..cc788a6 100644 --- a/src/views/floodSys/floodOneMap/tabRightWL.vue +++ b/src/views/floodSys/floodOneMap/tabRightWL.vue @@ -534,54 +534,54 @@ }; //获取管网监测统计分析 const getSuperVisePipeData = async () => { - let params = { - startTime: allData.pipeTime[0], - endTime: allData.pipeTime[1], - stCode: allData.supervisePipeCode, - }; - let res = await graphicReport(params); - if (res && res.code == 200) { - let datas = res.data; - if (!!!datas) return; - if (datas.propertyMonitorList.length > 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [ - datas.propertyMonitorList[2].monitorPropertyName, - datas.propertyMonitorList[0].monitorPropertyName, - ]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorList.length == 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorXList.length == 0) { - chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 - chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; - chartOption.floodOneMapPipeSupervise.series[0].data = []; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = ''; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - } - // 设置鼠标滚轮放大缩小展示数据区间 - chartOption.floodOneMapPipeSupervise.dataZoom = [ - { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, - ]; - initPipeChart(); - } + // let params = { + // startTime: allData.pipeTime[0], + // endTime: allData.pipeTime[1], + // stCode: allData.supervisePipeCode, + // }; + // let res = await graphicReport(params); + // if (res && res.code == 200) { + // let datas = res.data; + // if (!!!datas) return; + // if (datas.propertyMonitorList.length > 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [ + // datas.propertyMonitorList[2].monitorPropertyName, + // datas.propertyMonitorList[0].monitorPropertyName, + // ]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorList.length == 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorXList.length == 0) { + // chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = ''; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // } + // // 设置鼠标滚轮放大缩小展示数据区间 + // chartOption.floodOneMapPipeSupervise.dataZoom = [ + // { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, + // ]; + // initPipeChart(); + // } }; //管网监测趋势图 let pipeChart = null; @@ -810,24 +810,24 @@ const tableData6 = ref([]); const tableData71 = ref([]); const tableRef71 = ref(null); -const tableLoading71 = ref(true); +// const tableLoading71 = ref(true); //获取源头地块 const getOrinignList = async () => { - tableLoading71.value = true; - let res = await orinignList(); - if (res && res.code == 200) { - let data = res.data; - let params = data[0].stCodes; - let res1 = await orinignDataList(params); - if (res1 && res1.code == 200) { - tableData71.value = res1.data; - tableData71.value.forEach((item, index) => { - item.dataTime = res1.data[index].monitorValueList[0].tt; - }); - tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 - tableLoading71.value = false; - } - } + // tableLoading71.value = true; + // let res = await orinignList(); + // if (res && res.code == 200) { + // let data = res.data; + // let params = data[0].stCodes; + // let res1 = await orinignDataList(params); + // if (res1 && res1.code == 200) { + // tableData71.value = res1.data; + // tableData71.value.forEach((item, index) => { + // item.dataTime = res1.data[index].monitorValueList[0].tt; + // }); + // tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 + // tableLoading71.value = false; + // } + // } }; const tableData7 = ref([]); //获取厂站概况 diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue index be44d99..b50387c 100644 --- a/src/views/floodSys/floodOneMap/tabSelect.vue +++ b/src/views/floodSys/floodOneMap/tabSelect.vue @@ -239,7 +239,7 @@ bottom: 1%; left: 450px; position: absolute; - z-index: 115; + z-index: 1150; .changeTab { width: 175px; height: 43px; diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 3548f11..6521b57 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -86,8 +86,8 @@ - - + + diff --git a/src/views/longoPeration/LSCaseIssues.vue b/src/views/longoPeration/LSCaseIssues.vue index eefff4b..5405074 100644 --- a/src/views/longoPeration/LSCaseIssues.vue +++ b/src/views/longoPeration/LSCaseIssues.vue @@ -85,7 +85,7 @@ - + diff --git a/src/views/longoPeration/ProblemStatistics.vue b/src/views/longoPeration/ProblemStatistics.vue index dd5fe6a..84798fb 100644 --- a/src/views/longoPeration/ProblemStatistics.vue +++ b/src/views/longoPeration/ProblemStatistics.vue @@ -159,11 +159,11 @@ /** 搜索列表 */ const getList = async () => { if (queryParams.value.timer) { - queryParams.value.projectStartTime = queryParams.value.timer[0]; - queryParams.value.projectEndTime = queryParams.value.timer[1]; + queryParams.value.startTime = queryParams.value.timer[0]; + queryParams.value.endTime = queryParams.value.timer[1]; } else { - queryParams.value.projectStartTime = ''; - queryParams.value.projectEndTime = ''; + queryParams.value.startTime = ''; + queryParams.value.endTime = ''; } loading.value = true; let res = await patrolProblempage(queryParams.value); diff --git a/src/api/spongePerformance/naturalWaterArea.js b/src/api/spongePerformance/naturalWaterArea.js index cb24476..9654e06 100644 --- a/src/api/spongePerformance/naturalWaterArea.js +++ b/src/api/spongePerformance/naturalWaterArea.js @@ -46,11 +46,18 @@ // 可透水地面面积积详情列表 export const kstdmAreaByYear = params => { return request({ - url: `/sponge/performanceEvaluate/kstdmAreaByYear`, + url: `/sponge/performanceResultTspumj/list`, method: 'get', params, }); }; +// export const kstdmAreaByYear = params => { +// return request({ +// url: `/sponge/performanceEvaluate/kstdmAreaByYear`, +// method: 'get', +// params, +// }); +// }; // 业务分页搜索海绵考核评估项数据类型 export const yszylyDetailList = params => { return request({ diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index f382cba..c7534aa 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -98,7 +98,7 @@ if (!file) return; window.open(file.url); documentAccessRecordAdd({ - fileId: row.id, + fileId: row.fileId, }); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index fa31e23..84c53c5 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -219,7 +219,7 @@ height: 476px; background-image: url('@/assets/newImgs/layer1.png'); background-size: 100% 100%; - z-index: 115; + z-index: 1150; position: absolute; top: 80px; left: 530px; diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue index a3af685..cc788a6 100644 --- a/src/views/floodSys/floodOneMap/tabRightWL.vue +++ b/src/views/floodSys/floodOneMap/tabRightWL.vue @@ -534,54 +534,54 @@ }; //获取管网监测统计分析 const getSuperVisePipeData = async () => { - let params = { - startTime: allData.pipeTime[0], - endTime: allData.pipeTime[1], - stCode: allData.supervisePipeCode, - }; - let res = await graphicReport(params); - if (res && res.code == 200) { - let datas = res.data; - if (!!!datas) return; - if (datas.propertyMonitorList.length > 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [ - datas.propertyMonitorList[2].monitorPropertyName, - datas.propertyMonitorList[0].monitorPropertyName, - ]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorList.length == 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorXList.length == 0) { - chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 - chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; - chartOption.floodOneMapPipeSupervise.series[0].data = []; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = ''; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - } - // 设置鼠标滚轮放大缩小展示数据区间 - chartOption.floodOneMapPipeSupervise.dataZoom = [ - { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, - ]; - initPipeChart(); - } + // let params = { + // startTime: allData.pipeTime[0], + // endTime: allData.pipeTime[1], + // stCode: allData.supervisePipeCode, + // }; + // let res = await graphicReport(params); + // if (res && res.code == 200) { + // let datas = res.data; + // if (!!!datas) return; + // if (datas.propertyMonitorList.length > 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [ + // datas.propertyMonitorList[2].monitorPropertyName, + // datas.propertyMonitorList[0].monitorPropertyName, + // ]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorList.length == 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorXList.length == 0) { + // chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = ''; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // } + // // 设置鼠标滚轮放大缩小展示数据区间 + // chartOption.floodOneMapPipeSupervise.dataZoom = [ + // { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, + // ]; + // initPipeChart(); + // } }; //管网监测趋势图 let pipeChart = null; @@ -810,24 +810,24 @@ const tableData6 = ref([]); const tableData71 = ref([]); const tableRef71 = ref(null); -const tableLoading71 = ref(true); +// const tableLoading71 = ref(true); //获取源头地块 const getOrinignList = async () => { - tableLoading71.value = true; - let res = await orinignList(); - if (res && res.code == 200) { - let data = res.data; - let params = data[0].stCodes; - let res1 = await orinignDataList(params); - if (res1 && res1.code == 200) { - tableData71.value = res1.data; - tableData71.value.forEach((item, index) => { - item.dataTime = res1.data[index].monitorValueList[0].tt; - }); - tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 - tableLoading71.value = false; - } - } + // tableLoading71.value = true; + // let res = await orinignList(); + // if (res && res.code == 200) { + // let data = res.data; + // let params = data[0].stCodes; + // let res1 = await orinignDataList(params); + // if (res1 && res1.code == 200) { + // tableData71.value = res1.data; + // tableData71.value.forEach((item, index) => { + // item.dataTime = res1.data[index].monitorValueList[0].tt; + // }); + // tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 + // tableLoading71.value = false; + // } + // } }; const tableData7 = ref([]); //获取厂站概况 diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue index be44d99..b50387c 100644 --- a/src/views/floodSys/floodOneMap/tabSelect.vue +++ b/src/views/floodSys/floodOneMap/tabSelect.vue @@ -239,7 +239,7 @@ bottom: 1%; left: 450px; position: absolute; - z-index: 115; + z-index: 1150; .changeTab { width: 175px; height: 43px; diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 3548f11..6521b57 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -86,8 +86,8 @@ - - + + diff --git a/src/views/longoPeration/LSCaseIssues.vue b/src/views/longoPeration/LSCaseIssues.vue index eefff4b..5405074 100644 --- a/src/views/longoPeration/LSCaseIssues.vue +++ b/src/views/longoPeration/LSCaseIssues.vue @@ -85,7 +85,7 @@ - + diff --git a/src/views/longoPeration/ProblemStatistics.vue b/src/views/longoPeration/ProblemStatistics.vue index dd5fe6a..84798fb 100644 --- a/src/views/longoPeration/ProblemStatistics.vue +++ b/src/views/longoPeration/ProblemStatistics.vue @@ -159,11 +159,11 @@ /** 搜索列表 */ const getList = async () => { if (queryParams.value.timer) { - queryParams.value.projectStartTime = queryParams.value.timer[0]; - queryParams.value.projectEndTime = queryParams.value.timer[1]; + queryParams.value.startTime = queryParams.value.timer[0]; + queryParams.value.endTime = queryParams.value.timer[1]; } else { - queryParams.value.projectStartTime = ''; - queryParams.value.projectEndTime = ''; + queryParams.value.startTime = ''; + queryParams.value.endTime = ''; } loading.value = true; let res = await patrolProblempage(queryParams.value); diff --git a/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue b/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue index e90a207..338b4ca 100644 --- a/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue +++ b/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue @@ -2,7 +2,7 @@
- + { return request({ - url: `/sponge/performanceEvaluate/kstdmAreaByYear`, + url: `/sponge/performanceResultTspumj/list`, method: 'get', params, }); }; +// export const kstdmAreaByYear = params => { +// return request({ +// url: `/sponge/performanceEvaluate/kstdmAreaByYear`, +// method: 'get', +// params, +// }); +// }; // 业务分页搜索海绵考核评估项数据类型 export const yszylyDetailList = params => { return request({ diff --git a/src/views/document/fileManagement/updateRecord/index.vue b/src/views/document/fileManagement/updateRecord/index.vue index f382cba..c7534aa 100644 --- a/src/views/document/fileManagement/updateRecord/index.vue +++ b/src/views/document/fileManagement/updateRecord/index.vue @@ -98,7 +98,7 @@ if (!file) return; window.open(file.url); documentAccessRecordAdd({ - fileId: row.id, + fileId: row.fileId, }); }; diff --git a/src/views/floodSys/floodOneMap/commonPopupRain.vue b/src/views/floodSys/floodOneMap/commonPopupRain.vue index fa31e23..84c53c5 100644 --- a/src/views/floodSys/floodOneMap/commonPopupRain.vue +++ b/src/views/floodSys/floodOneMap/commonPopupRain.vue @@ -219,7 +219,7 @@ height: 476px; background-image: url('@/assets/newImgs/layer1.png'); background-size: 100% 100%; - z-index: 115; + z-index: 1150; position: absolute; top: 80px; left: 530px; diff --git a/src/views/floodSys/floodOneMap/tabRightWL.vue b/src/views/floodSys/floodOneMap/tabRightWL.vue index a3af685..cc788a6 100644 --- a/src/views/floodSys/floodOneMap/tabRightWL.vue +++ b/src/views/floodSys/floodOneMap/tabRightWL.vue @@ -534,54 +534,54 @@ }; //获取管网监测统计分析 const getSuperVisePipeData = async () => { - let params = { - startTime: allData.pipeTime[0], - endTime: allData.pipeTime[1], - stCode: allData.supervisePipeCode, - }; - let res = await graphicReport(params); - if (res && res.code == 200) { - let datas = res.data; - if (!!!datas) return; - if (datas.propertyMonitorList.length > 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [ - datas.propertyMonitorList[2].monitorPropertyName, - datas.propertyMonitorList[0].monitorPropertyName, - ]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorList.length == 1) { - chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; - chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 - } else if (datas.propertyMonitorXList.length == 0) { - chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 - chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; - chartOption.floodOneMapPipeSupervise.series[0].data = []; - chartOption.floodOneMapPipeSupervise.series[1].data = []; - chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; - chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; - chartOption.floodOneMapPipeSupervise.series[0].name = ''; - chartOption.floodOneMapPipeSupervise.series[1].name = ''; - } - // 设置鼠标滚轮放大缩小展示数据区间 - chartOption.floodOneMapPipeSupervise.dataZoom = [ - { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, - ]; - initPipeChart(); - } + // let params = { + // startTime: allData.pipeTime[0], + // endTime: allData.pipeTime[1], + // stCode: allData.supervisePipeCode, + // }; + // let res = await graphicReport(params); + // if (res && res.code == 200) { + // let datas = res.data; + // if (!!!datas) return; + // if (datas.propertyMonitorList.length > 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [ + // datas.propertyMonitorList[2].monitorPropertyName, + // datas.propertyMonitorList[0].monitorPropertyName, + // ]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[2].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[2].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[2].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorList.length == 1) { + // chartOption.floodOneMapPipeSupervise.legend.data = [datas.propertyMonitorList[0].monitorPropertyName]; + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = datas.propertyMonitorXList; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = datas.propertyMonitorList[0].propertyUnit; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = datas.propertyMonitorList[0].monitorPropertyName; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].data = datas.propertyMonitorList[0].ylist; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.graphic.invisible = true; // 暂无数据 + // } else if (datas.propertyMonitorXList.length == 0) { + // chartOption.floodOneMapPipeSupervise.graphic.invisible = false; // 暂无数据 + // chartOption.floodOneMapPipeSupervise.xAxis[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[0].data = []; + // chartOption.floodOneMapPipeSupervise.series[1].data = []; + // chartOption.floodOneMapPipeSupervise.yAxis[0].name = ''; + // chartOption.floodOneMapPipeSupervise.yAxis[1].name = ''; + // chartOption.floodOneMapPipeSupervise.series[0].name = ''; + // chartOption.floodOneMapPipeSupervise.series[1].name = ''; + // } + // // 设置鼠标滚轮放大缩小展示数据区间 + // chartOption.floodOneMapPipeSupervise.dataZoom = [ + // { type: 'inside', startValue: datas.propertyMonitorXList[datas.propertyMonitorXList.length / 2] }, + // ]; + // initPipeChart(); + // } }; //管网监测趋势图 let pipeChart = null; @@ -810,24 +810,24 @@ const tableData6 = ref([]); const tableData71 = ref([]); const tableRef71 = ref(null); -const tableLoading71 = ref(true); +// const tableLoading71 = ref(true); //获取源头地块 const getOrinignList = async () => { - tableLoading71.value = true; - let res = await orinignList(); - if (res && res.code == 200) { - let data = res.data; - let params = data[0].stCodes; - let res1 = await orinignDataList(params); - if (res1 && res1.code == 200) { - tableData71.value = res1.data; - tableData71.value.forEach((item, index) => { - item.dataTime = res1.data[index].monitorValueList[0].tt; - }); - tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 - tableLoading71.value = false; - } - } + // tableLoading71.value = true; + // let res = await orinignList(); + // if (res && res.code == 200) { + // let data = res.data; + // let params = data[0].stCodes; + // let res1 = await orinignDataList(params); + // if (res1 && res1.code == 200) { + // tableData71.value = res1.data; + // tableData71.value.forEach((item, index) => { + // item.dataTime = res1.data[index].monitorValueList[0].tt; + // }); + // tableRef71.value.setCurrentRow(tableData71.value[0], true); //表格默认第一个高亮选中 + // tableLoading71.value = false; + // } + // } }; const tableData7 = ref([]); //获取厂站概况 diff --git a/src/views/floodSys/floodOneMap/tabSelect.vue b/src/views/floodSys/floodOneMap/tabSelect.vue index be44d99..b50387c 100644 --- a/src/views/floodSys/floodOneMap/tabSelect.vue +++ b/src/views/floodSys/floodOneMap/tabSelect.vue @@ -239,7 +239,7 @@ bottom: 1%; left: 450px; position: absolute; - z-index: 115; + z-index: 1150; .changeTab { width: 175px; height: 43px; diff --git a/src/views/longoPeration/CaseIssues.vue b/src/views/longoPeration/CaseIssues.vue index 3548f11..6521b57 100644 --- a/src/views/longoPeration/CaseIssues.vue +++ b/src/views/longoPeration/CaseIssues.vue @@ -86,8 +86,8 @@ - - + + diff --git a/src/views/longoPeration/LSCaseIssues.vue b/src/views/longoPeration/LSCaseIssues.vue index eefff4b..5405074 100644 --- a/src/views/longoPeration/LSCaseIssues.vue +++ b/src/views/longoPeration/LSCaseIssues.vue @@ -85,7 +85,7 @@ - + diff --git a/src/views/longoPeration/ProblemStatistics.vue b/src/views/longoPeration/ProblemStatistics.vue index dd5fe6a..84798fb 100644 --- a/src/views/longoPeration/ProblemStatistics.vue +++ b/src/views/longoPeration/ProblemStatistics.vue @@ -159,11 +159,11 @@ /** 搜索列表 */ const getList = async () => { if (queryParams.value.timer) { - queryParams.value.projectStartTime = queryParams.value.timer[0]; - queryParams.value.projectEndTime = queryParams.value.timer[1]; + queryParams.value.startTime = queryParams.value.timer[0]; + queryParams.value.endTime = queryParams.value.timer[1]; } else { - queryParams.value.projectStartTime = ''; - queryParams.value.projectEndTime = ''; + queryParams.value.startTime = ''; + queryParams.value.endTime = ''; } loading.value = true; let res = await patrolProblempage(queryParams.value); diff --git a/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue b/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue index e90a207..338b4ca 100644 --- a/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue +++ b/src/views/spongePerformance/OutputPerformance/SewageTreatment.vue @@ -2,7 +2,7 @@
- + - - + +