diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 690f489..44d56f9 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -493,4 +493,12 @@
method: 'post',
params
})
+}
+// 防汛检查
+export function watchPersonSignList(params) {
+ return request({
+ url: '/business/watchPersonSign/list',
+ method: 'get',
+ params
+ });
}
\ No newline at end of file
diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 690f489..44d56f9 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -493,4 +493,12 @@
method: 'post',
params
})
+}
+// 防汛检查
+export function watchPersonSignList(params) {
+ return request({
+ url: '/business/watchPersonSign/list',
+ method: 'get',
+ params
+ });
}
\ No newline at end of file
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
index 9059cca..6477796 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
@@ -116,36 +116,36 @@
},
},
series: [
- {
- type: "line",
- // triggerLineEvent:true,
- z:6,
- silent: true,
- name: '应到',
- data: props.echartData.data1,
- symbol: "circle",
- symbolSize: nowSize(8, 1920),
- showSymbol: true,
- lineStyle: {
- width: nowSize(2, 1920),
- color: "rgba(25, 214, 255, 1)",
- },
- areaStyle: {
- color: new proxy.echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 0,
- color: "rgba(25, 214, 255, 0.7)",
- },
- {
- offset: 0.7,
- color: "rgba(25, 214, 255, 0)",
- },
- ]),
- },
- itemStyle: {
- color: "rgba(25, 214, 255, 1)", //拐点颜色
- },
- },
+ // {
+ // type: "line",
+ // // triggerLineEvent:true,
+ // z:6,
+ // silent: true,
+ // name: '应到',
+ // data: props.echartData.data1,
+ // symbol: "circle",
+ // symbolSize: nowSize(8, 1920),
+ // showSymbol: true,
+ // lineStyle: {
+ // width: nowSize(2, 1920),
+ // color: "rgba(25, 214, 255, 1)",
+ // },
+ // areaStyle: {
+ // color: new proxy.echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ // {
+ // offset: 0,
+ // color: "rgba(25, 214, 255, 0.7)",
+ // },
+ // {
+ // offset: 0.7,
+ // color: "rgba(25, 214, 255, 0)",
+ // },
+ // ]),
+ // },
+ // itemStyle: {
+ // color: "rgba(25, 214, 255, 1)", //拐点颜色
+ // },
+ // },
{
type: "line",
// triggerLineEvent:true,
diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 690f489..44d56f9 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -493,4 +493,12 @@
method: 'post',
params
})
+}
+// 防汛检查
+export function watchPersonSignList(params) {
+ return request({
+ url: '/business/watchPersonSign/list',
+ method: 'get',
+ params
+ });
}
\ No newline at end of file
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
index 9059cca..6477796 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
@@ -116,36 +116,36 @@
},
},
series: [
- {
- type: "line",
- // triggerLineEvent:true,
- z:6,
- silent: true,
- name: '应到',
- data: props.echartData.data1,
- symbol: "circle",
- symbolSize: nowSize(8, 1920),
- showSymbol: true,
- lineStyle: {
- width: nowSize(2, 1920),
- color: "rgba(25, 214, 255, 1)",
- },
- areaStyle: {
- color: new proxy.echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 0,
- color: "rgba(25, 214, 255, 0.7)",
- },
- {
- offset: 0.7,
- color: "rgba(25, 214, 255, 0)",
- },
- ]),
- },
- itemStyle: {
- color: "rgba(25, 214, 255, 1)", //拐点颜色
- },
- },
+ // {
+ // type: "line",
+ // // triggerLineEvent:true,
+ // z:6,
+ // silent: true,
+ // name: '应到',
+ // data: props.echartData.data1,
+ // symbol: "circle",
+ // symbolSize: nowSize(8, 1920),
+ // showSymbol: true,
+ // lineStyle: {
+ // width: nowSize(2, 1920),
+ // color: "rgba(25, 214, 255, 1)",
+ // },
+ // areaStyle: {
+ // color: new proxy.echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ // {
+ // offset: 0,
+ // color: "rgba(25, 214, 255, 0.7)",
+ // },
+ // {
+ // offset: 0.7,
+ // color: "rgba(25, 214, 255, 0)",
+ // },
+ // ]),
+ // },
+ // itemStyle: {
+ // color: "rgba(25, 214, 255, 1)", //拐点颜色
+ // },
+ // },
{
type: "line",
// triggerLineEvent:true,
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue
index a2e3004..49e3055 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue
@@ -58,7 +58,8 @@
},
formatter: function(params) {
console.log(params)
- return `
${params[0].name}
应到:${params[0].value}人
实到:${params[1].value}人
`
+ return `实到:${params[0].value}人
`
+ // return `${params[0].name}
应到:${params[0].value}人
实到:${params[1].value}人
`
}
},
grid: {
@@ -97,7 +98,8 @@
yAxis:{
type: "category",
data:props.echartData.xdata,
- name: '应到/实到',
+ // name: '应到/实到',
+ name: '实到',
nameLocation: 'start',
nameTextStyle: {
color: "#AAC1CF",
@@ -137,33 +139,35 @@
// }
// }
},
- series:[{
- type: 'bar',
- name:'应到',
- stack: "总数",
- data: props.echartData.data1,
- barWidth:nowSize(10,1920),
- zlevel:1,
- itemStyle: {
- barBorderRadius:nowSize(5,1920),
- color: new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
- {
- offset: 0,
- color: "rgba(25, 160, 255, 1)",
- },
- {
- offset: 1,
- color: "rgba(25, 160, 255, 1)",
- },
- ]),
- },
- },{
+ series:[
+ // {
+ // type: 'bar',
+ // name:'应到',
+ // stack: "总数",
+ // data: props.echartData.data1,
+ // barWidth:nowSize(10,1920),
+ // zlevel:1,
+ // itemStyle: {
+ // barBorderRadius:nowSize(5,1920),
+ // color: new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
+ // {
+ // offset: 0,
+ // color: "rgba(25, 160, 255, 1)",
+ // },
+ // {
+ // offset: 1,
+ // color: "rgba(25, 160, 255, 1)",
+ // },
+ // ]),
+ // },
+ // },
+ {
type: 'bar',
name:'实到',
- stack: "总数",
+ // stack: "总数",
data: props.echartData.data2,
barWidth:nowSize(10,1920),
- zlevel:1,
+ // zlevel:1,
itemStyle: {
barBorderRadius:nowSize(5,1920),
color: new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
@@ -177,7 +181,8 @@
},
]),
},
- },{
+ },
+ {
name: '背景',
type: 'bar',
barWidth:nowSize(10,1920),
diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 690f489..44d56f9 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -493,4 +493,12 @@
method: 'post',
params
})
+}
+// 防汛检查
+export function watchPersonSignList(params) {
+ return request({
+ url: '/business/watchPersonSign/list',
+ method: 'get',
+ params
+ });
}
\ No newline at end of file
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
index 9059cca..6477796 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
@@ -116,36 +116,36 @@
},
},
series: [
- {
- type: "line",
- // triggerLineEvent:true,
- z:6,
- silent: true,
- name: '应到',
- data: props.echartData.data1,
- symbol: "circle",
- symbolSize: nowSize(8, 1920),
- showSymbol: true,
- lineStyle: {
- width: nowSize(2, 1920),
- color: "rgba(25, 214, 255, 1)",
- },
- areaStyle: {
- color: new proxy.echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 0,
- color: "rgba(25, 214, 255, 0.7)",
- },
- {
- offset: 0.7,
- color: "rgba(25, 214, 255, 0)",
- },
- ]),
- },
- itemStyle: {
- color: "rgba(25, 214, 255, 1)", //拐点颜色
- },
- },
+ // {
+ // type: "line",
+ // // triggerLineEvent:true,
+ // z:6,
+ // silent: true,
+ // name: '应到',
+ // data: props.echartData.data1,
+ // symbol: "circle",
+ // symbolSize: nowSize(8, 1920),
+ // showSymbol: true,
+ // lineStyle: {
+ // width: nowSize(2, 1920),
+ // color: "rgba(25, 214, 255, 1)",
+ // },
+ // areaStyle: {
+ // color: new proxy.echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ // {
+ // offset: 0,
+ // color: "rgba(25, 214, 255, 0.7)",
+ // },
+ // {
+ // offset: 0.7,
+ // color: "rgba(25, 214, 255, 0)",
+ // },
+ // ]),
+ // },
+ // itemStyle: {
+ // color: "rgba(25, 214, 255, 1)", //拐点颜色
+ // },
+ // },
{
type: "line",
// triggerLineEvent:true,
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue
index a2e3004..49e3055 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue
@@ -58,7 +58,8 @@
},
formatter: function(params) {
console.log(params)
- return `${params[0].name}
应到:${params[0].value}人
实到:${params[1].value}人
`
+ return `实到:${params[0].value}人
`
+ // return `${params[0].name}
应到:${params[0].value}人
实到:${params[1].value}人
`
}
},
grid: {
@@ -97,7 +98,8 @@
yAxis:{
type: "category",
data:props.echartData.xdata,
- name: '应到/实到',
+ // name: '应到/实到',
+ name: '实到',
nameLocation: 'start',
nameTextStyle: {
color: "#AAC1CF",
@@ -137,33 +139,35 @@
// }
// }
},
- series:[{
- type: 'bar',
- name:'应到',
- stack: "总数",
- data: props.echartData.data1,
- barWidth:nowSize(10,1920),
- zlevel:1,
- itemStyle: {
- barBorderRadius:nowSize(5,1920),
- color: new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
- {
- offset: 0,
- color: "rgba(25, 160, 255, 1)",
- },
- {
- offset: 1,
- color: "rgba(25, 160, 255, 1)",
- },
- ]),
- },
- },{
+ series:[
+ // {
+ // type: 'bar',
+ // name:'应到',
+ // stack: "总数",
+ // data: props.echartData.data1,
+ // barWidth:nowSize(10,1920),
+ // zlevel:1,
+ // itemStyle: {
+ // barBorderRadius:nowSize(5,1920),
+ // color: new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
+ // {
+ // offset: 0,
+ // color: "rgba(25, 160, 255, 1)",
+ // },
+ // {
+ // offset: 1,
+ // color: "rgba(25, 160, 255, 1)",
+ // },
+ // ]),
+ // },
+ // },
+ {
type: 'bar',
name:'实到',
- stack: "总数",
+ // stack: "总数",
data: props.echartData.data2,
barWidth:nowSize(10,1920),
- zlevel:1,
+ // zlevel:1,
itemStyle: {
barBorderRadius:nowSize(5,1920),
color: new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
@@ -177,7 +181,8 @@
},
]),
},
- },{
+ },
+ {
name: '背景',
type: 'bar',
barWidth:nowSize(10,1920),
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/fxjc.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/fxjc.vue
index 9aae01a..15ab1ad 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/fxjc.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/fxjc.vue
@@ -100,9 +100,9 @@
obj.xdata.push(element.watchAreaName)
obj.data1.push(element.areaPeopleNum)
obj.data2.push(element.signNumber)
- obj.max.push(Number(element.areaPeopleNum)+Number(element.signNumber))
+ // obj.max.push(Number(element.areaPeopleNum)+Number(element.signNumber))
});
- let max=JSON.parse(JSON.stringify(obj.max))
+ let max=JSON.parse(JSON.stringify(obj.data2))
let one=max.sort((a, b) => b - a)[0]
max.forEach(i=>{
obj.num.push(one)
diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js
index 690f489..44d56f9 100644
--- a/src/api/FloodControlAndDrainage.js
+++ b/src/api/FloodControlAndDrainage.js
@@ -493,4 +493,12 @@
method: 'post',
params
})
+}
+// 防汛检查
+export function watchPersonSignList(params) {
+ return request({
+ url: '/business/watchPersonSign/list',
+ method: 'get',
+ params
+ });
}
\ No newline at end of file
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
index 9059cca..6477796 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartFx.vue
@@ -116,36 +116,36 @@
},
},
series: [
- {
- type: "line",
- // triggerLineEvent:true,
- z:6,
- silent: true,
- name: '应到',
- data: props.echartData.data1,
- symbol: "circle",
- symbolSize: nowSize(8, 1920),
- showSymbol: true,
- lineStyle: {
- width: nowSize(2, 1920),
- color: "rgba(25, 214, 255, 1)",
- },
- areaStyle: {
- color: new proxy.echarts.graphic.LinearGradient(0, 0, 0, 1, [
- {
- offset: 0,
- color: "rgba(25, 214, 255, 0.7)",
- },
- {
- offset: 0.7,
- color: "rgba(25, 214, 255, 0)",
- },
- ]),
- },
- itemStyle: {
- color: "rgba(25, 214, 255, 1)", //拐点颜色
- },
- },
+ // {
+ // type: "line",
+ // // triggerLineEvent:true,
+ // z:6,
+ // silent: true,
+ // name: '应到',
+ // data: props.echartData.data1,
+ // symbol: "circle",
+ // symbolSize: nowSize(8, 1920),
+ // showSymbol: true,
+ // lineStyle: {
+ // width: nowSize(2, 1920),
+ // color: "rgba(25, 214, 255, 1)",
+ // },
+ // areaStyle: {
+ // color: new proxy.echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ // {
+ // offset: 0,
+ // color: "rgba(25, 214, 255, 0.7)",
+ // },
+ // {
+ // offset: 0.7,
+ // color: "rgba(25, 214, 255, 0)",
+ // },
+ // ]),
+ // },
+ // itemStyle: {
+ // color: "rgba(25, 214, 255, 1)", //拐点颜色
+ // },
+ // },
{
type: "line",
// triggerLineEvent:true,
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue
index a2e3004..49e3055 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/chartZs.vue
@@ -58,7 +58,8 @@
},
formatter: function(params) {
console.log(params)
- return `${params[0].name}
应到:${params[0].value}人
实到:${params[1].value}人
`
+ return `实到:${params[0].value}人
`
+ // return `${params[0].name}
应到:${params[0].value}人
实到:${params[1].value}人
`
}
},
grid: {
@@ -97,7 +98,8 @@
yAxis:{
type: "category",
data:props.echartData.xdata,
- name: '应到/实到',
+ // name: '应到/实到',
+ name: '实到',
nameLocation: 'start',
nameTextStyle: {
color: "#AAC1CF",
@@ -137,33 +139,35 @@
// }
// }
},
- series:[{
- type: 'bar',
- name:'应到',
- stack: "总数",
- data: props.echartData.data1,
- barWidth:nowSize(10,1920),
- zlevel:1,
- itemStyle: {
- barBorderRadius:nowSize(5,1920),
- color: new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
- {
- offset: 0,
- color: "rgba(25, 160, 255, 1)",
- },
- {
- offset: 1,
- color: "rgba(25, 160, 255, 1)",
- },
- ]),
- },
- },{
+ series:[
+ // {
+ // type: 'bar',
+ // name:'应到',
+ // stack: "总数",
+ // data: props.echartData.data1,
+ // barWidth:nowSize(10,1920),
+ // zlevel:1,
+ // itemStyle: {
+ // barBorderRadius:nowSize(5,1920),
+ // color: new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
+ // {
+ // offset: 0,
+ // color: "rgba(25, 160, 255, 1)",
+ // },
+ // {
+ // offset: 1,
+ // color: "rgba(25, 160, 255, 1)",
+ // },
+ // ]),
+ // },
+ // },
+ {
type: 'bar',
name:'实到',
- stack: "总数",
+ // stack: "总数",
data: props.echartData.data2,
barWidth:nowSize(10,1920),
- zlevel:1,
+ // zlevel:1,
itemStyle: {
barBorderRadius:nowSize(5,1920),
color: new proxy.echarts.graphic.LinearGradient(0, 0, 1, 1, [
@@ -177,7 +181,8 @@
},
]),
},
- },{
+ },
+ {
name: '背景',
type: 'bar',
barWidth:nowSize(10,1920),
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/fxjc.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/fxjc.vue
index 9aae01a..15ab1ad 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/fxjc.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/fxjc.vue
@@ -100,9 +100,9 @@
obj.xdata.push(element.watchAreaName)
obj.data1.push(element.areaPeopleNum)
obj.data2.push(element.signNumber)
- obj.max.push(Number(element.areaPeopleNum)+Number(element.signNumber))
+ // obj.max.push(Number(element.areaPeopleNum)+Number(element.signNumber))
});
- let max=JSON.parse(JSON.stringify(obj.max))
+ let max=JSON.parse(JSON.stringify(obj.data2))
let one=max.sort((a, b) => b - a)[0]
max.forEach(i=>{
obj.num.push(one)
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue
index 173c0b8..13c898e 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/fxjc.vue
@@ -51,6 +51,9 @@
deptUser(props.data.relateDeptId).then(res => {
infoData.value = res.data;
});
+ reviewApi.watchPersonSignList({watchId:props.data.id}).then(res => {
+ console.log('222222点位上图',res.data)
+ });
}
watch(
() => props.data,