diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 2e1d0ab..ec67bc8 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -87,7 +87,7 @@ /> - + @@ -134,13 +134,13 @@ - + @@ -216,6 +216,15 @@ { value: '1', label: '已激活' }, { value: '2', label: '未激活' }, ]); +const weekList = ref([ + { value: '1', label: '周日' }, + { value: '2', label: '周一' }, + { value: '3', label: '周二' }, + { value: '4', label: '周三' }, + { value: '5', label: '周四' }, + { value: '6', label: '周五' }, + { value: '7', label: '周六' }, +]); const userList = ref([]); const loading = ref(true); const total = ref(1); @@ -245,6 +254,7 @@ patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }], reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }], eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }], + patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }], }, }); const { queryParams, form, rules } = toRefs(AllData); @@ -341,6 +351,7 @@ form.value.patrolUserList = form.value.patrolUserList.map(obj => { return { userId: String(obj.userId) }; }); + form.value.basicInfoId = '1686274734091489284'; // console.log(form.value, 'form.value'); patrolPlanadd(form.value).then(response => { diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 2e1d0ab..ec67bc8 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -87,7 +87,7 @@ /> - + @@ -134,13 +134,13 @@ - + @@ -216,6 +216,15 @@ { value: '1', label: '已激活' }, { value: '2', label: '未激活' }, ]); +const weekList = ref([ + { value: '1', label: '周日' }, + { value: '2', label: '周一' }, + { value: '3', label: '周二' }, + { value: '4', label: '周三' }, + { value: '5', label: '周四' }, + { value: '6', label: '周五' }, + { value: '7', label: '周六' }, +]); const userList = ref([]); const loading = ref(true); const total = ref(1); @@ -245,6 +254,7 @@ patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }], reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }], eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }], + patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }], }, }); const { queryParams, form, rules } = toRefs(AllData); @@ -341,6 +351,7 @@ form.value.patrolUserList = form.value.patrolUserList.map(obj => { return { userId: String(obj.userId) }; }); + form.value.basicInfoId = '1686274734091489284'; // console.log(form.value, 'form.value'); patrolPlanadd(form.value).then(response => { diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue index 2e96fa9..6e29cf0 100644 --- a/src/views/publicService/quesNaire.vue +++ b/src/views/publicService/quesNaire.vue @@ -50,7 +50,9 @@ > 删除 - 满意度统计 + + 满意度统计 + @@ -93,7 +95,7 @@ @@ -195,6 +197,7 @@ const dialogShowAns = ref(false); const allData = reactive({ + ifStartQy: '', queryParams: { pageNum: 1, pageSize: 10, @@ -243,6 +246,12 @@ tableLoading.value = true; quesNairePage(queryParams.value).then(response => { tableData.value = response.data; + response.data.forEach(element => { + if (element.ifStart == 0) { + allData.ifStartQy = element.ifStart; + console.log(allData.ifStartQy, ' allData.ifStartQy'); + } + }); total.value = response.total; tableLoading.value = false; }); diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 2e1d0ab..ec67bc8 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -87,7 +87,7 @@ /> - + @@ -134,13 +134,13 @@ - + @@ -216,6 +216,15 @@ { value: '1', label: '已激活' }, { value: '2', label: '未激活' }, ]); +const weekList = ref([ + { value: '1', label: '周日' }, + { value: '2', label: '周一' }, + { value: '3', label: '周二' }, + { value: '4', label: '周三' }, + { value: '5', label: '周四' }, + { value: '6', label: '周五' }, + { value: '7', label: '周六' }, +]); const userList = ref([]); const loading = ref(true); const total = ref(1); @@ -245,6 +254,7 @@ patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }], reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }], eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }], + patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }], }, }); const { queryParams, form, rules } = toRefs(AllData); @@ -341,6 +351,7 @@ form.value.patrolUserList = form.value.patrolUserList.map(obj => { return { userId: String(obj.userId) }; }); + form.value.basicInfoId = '1686274734091489284'; // console.log(form.value, 'form.value'); patrolPlanadd(form.value).then(response => { diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue index 2e96fa9..6e29cf0 100644 --- a/src/views/publicService/quesNaire.vue +++ b/src/views/publicService/quesNaire.vue @@ -50,7 +50,9 @@ > 删除 - 满意度统计 + + 满意度统计 + @@ -93,7 +95,7 @@ @@ -195,6 +197,7 @@ const dialogShowAns = ref(false); const allData = reactive({ + ifStartQy: '', queryParams: { pageNum: 1, pageSize: 10, @@ -243,6 +246,12 @@ tableLoading.value = true; quesNairePage(queryParams.value).then(response => { tableData.value = response.data; + response.data.forEach(element => { + if (element.ifStart == 0) { + allData.ifStartQy = element.ifStart; + console.log(allData.ifStartQy, ' allData.ifStartQy'); + } + }); total.value = response.total; tableLoading.value = false; }); diff --git a/src/views/sponeScreen/longYW/InspectionTasks.vue b/src/views/sponeScreen/longYW/InspectionTasks.vue index 6f8a5a7..9a1c9b3 100644 --- a/src/views/sponeScreen/longYW/InspectionTasks.vue +++ b/src/views/sponeScreen/longYW/InspectionTasks.vue @@ -86,7 +86,7 @@ } .scroll { width: 100%; - height: calc(100% - 20%); + height: calc(100% - 32%); overflow: hidden; display: inline-block; } diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 2e1d0ab..ec67bc8 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -87,7 +87,7 @@ /> - + @@ -134,13 +134,13 @@ - + @@ -216,6 +216,15 @@ { value: '1', label: '已激活' }, { value: '2', label: '未激活' }, ]); +const weekList = ref([ + { value: '1', label: '周日' }, + { value: '2', label: '周一' }, + { value: '3', label: '周二' }, + { value: '4', label: '周三' }, + { value: '5', label: '周四' }, + { value: '6', label: '周五' }, + { value: '7', label: '周六' }, +]); const userList = ref([]); const loading = ref(true); const total = ref(1); @@ -245,6 +254,7 @@ patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }], reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }], eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }], + patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }], }, }); const { queryParams, form, rules } = toRefs(AllData); @@ -341,6 +351,7 @@ form.value.patrolUserList = form.value.patrolUserList.map(obj => { return { userId: String(obj.userId) }; }); + form.value.basicInfoId = '1686274734091489284'; // console.log(form.value, 'form.value'); patrolPlanadd(form.value).then(response => { diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue index 2e96fa9..6e29cf0 100644 --- a/src/views/publicService/quesNaire.vue +++ b/src/views/publicService/quesNaire.vue @@ -50,7 +50,9 @@ > 删除 - 满意度统计 + + 满意度统计 + @@ -93,7 +95,7 @@ @@ -195,6 +197,7 @@ const dialogShowAns = ref(false); const allData = reactive({ + ifStartQy: '', queryParams: { pageNum: 1, pageSize: 10, @@ -243,6 +246,12 @@ tableLoading.value = true; quesNairePage(queryParams.value).then(response => { tableData.value = response.data; + response.data.forEach(element => { + if (element.ifStart == 0) { + allData.ifStartQy = element.ifStart; + console.log(allData.ifStartQy, ' allData.ifStartQy'); + } + }); total.value = response.total; tableLoading.value = false; }); diff --git a/src/views/sponeScreen/longYW/InspectionTasks.vue b/src/views/sponeScreen/longYW/InspectionTasks.vue index 6f8a5a7..9a1c9b3 100644 --- a/src/views/sponeScreen/longYW/InspectionTasks.vue +++ b/src/views/sponeScreen/longYW/InspectionTasks.vue @@ -86,7 +86,7 @@ } .scroll { width: 100%; - height: calc(100% - 20%); + height: calc(100% - 32%); overflow: hidden; display: inline-block; } diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue index 65c8774..3896dd6 100644 --- a/src/views/sponeScreen/longYW/ManualSampling.vue +++ b/src/views/sponeScreen/longYW/ManualSampling.vue @@ -123,7 +123,7 @@ .longYW { margin-top: 10px; width: 460px; - height: 31%; + height: 32.5%; background: #004565; opacity: 0.8; .ConstrucClass { @@ -164,11 +164,12 @@ } } .box-body { - height: 88%; + height: 80%; // background: yellowgreen; padding: 10px; .scrollMapHM { - height: 100%; + height: 95%; + // background: #013a73; p { width: 18%; // background: red; @@ -178,9 +179,11 @@ } .scroll { width: 100%; - height: calc(100% - 30%); + height: calc(100% - 40%); overflow: hidden; + overflow-y: auto; display: inline-block; + // background: red; } } } diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 2e1d0ab..ec67bc8 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -87,7 +87,7 @@ /> - + @@ -134,13 +134,13 @@ - + @@ -216,6 +216,15 @@ { value: '1', label: '已激活' }, { value: '2', label: '未激活' }, ]); +const weekList = ref([ + { value: '1', label: '周日' }, + { value: '2', label: '周一' }, + { value: '3', label: '周二' }, + { value: '4', label: '周三' }, + { value: '5', label: '周四' }, + { value: '6', label: '周五' }, + { value: '7', label: '周六' }, +]); const userList = ref([]); const loading = ref(true); const total = ref(1); @@ -245,6 +254,7 @@ patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }], reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }], eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }], + patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }], }, }); const { queryParams, form, rules } = toRefs(AllData); @@ -341,6 +351,7 @@ form.value.patrolUserList = form.value.patrolUserList.map(obj => { return { userId: String(obj.userId) }; }); + form.value.basicInfoId = '1686274734091489284'; // console.log(form.value, 'form.value'); patrolPlanadd(form.value).then(response => { diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue index 2e96fa9..6e29cf0 100644 --- a/src/views/publicService/quesNaire.vue +++ b/src/views/publicService/quesNaire.vue @@ -50,7 +50,9 @@ > 删除 - 满意度统计 + + 满意度统计 + @@ -93,7 +95,7 @@ @@ -195,6 +197,7 @@ const dialogShowAns = ref(false); const allData = reactive({ + ifStartQy: '', queryParams: { pageNum: 1, pageSize: 10, @@ -243,6 +246,12 @@ tableLoading.value = true; quesNairePage(queryParams.value).then(response => { tableData.value = response.data; + response.data.forEach(element => { + if (element.ifStart == 0) { + allData.ifStartQy = element.ifStart; + console.log(allData.ifStartQy, ' allData.ifStartQy'); + } + }); total.value = response.total; tableLoading.value = false; }); diff --git a/src/views/sponeScreen/longYW/InspectionTasks.vue b/src/views/sponeScreen/longYW/InspectionTasks.vue index 6f8a5a7..9a1c9b3 100644 --- a/src/views/sponeScreen/longYW/InspectionTasks.vue +++ b/src/views/sponeScreen/longYW/InspectionTasks.vue @@ -86,7 +86,7 @@ } .scroll { width: 100%; - height: calc(100% - 20%); + height: calc(100% - 32%); overflow: hidden; display: inline-block; } diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue index 65c8774..3896dd6 100644 --- a/src/views/sponeScreen/longYW/ManualSampling.vue +++ b/src/views/sponeScreen/longYW/ManualSampling.vue @@ -123,7 +123,7 @@ .longYW { margin-top: 10px; width: 460px; - height: 31%; + height: 32.5%; background: #004565; opacity: 0.8; .ConstrucClass { @@ -164,11 +164,12 @@ } } .box-body { - height: 88%; + height: 80%; // background: yellowgreen; padding: 10px; .scrollMapHM { - height: 100%; + height: 95%; + // background: #013a73; p { width: 18%; // background: red; @@ -178,9 +179,11 @@ } .scroll { width: 100%; - height: calc(100% - 30%); + height: calc(100% - 40%); overflow: hidden; + overflow-y: auto; display: inline-block; + // background: red; } } } diff --git a/src/views/sponeScreen/longYW/MonitoringStation.vue b/src/views/sponeScreen/longYW/MonitoringStation.vue index db91dc6..575fc49 100644 --- a/src/views/sponeScreen/longYW/MonitoringStation.vue +++ b/src/views/sponeScreen/longYW/MonitoringStation.vue @@ -71,7 +71,7 @@ .longYW { margin-top: 10px; width: 100%; - height: 31%; + height: 32.5%; background: #004565; opacity: 0.8; } @@ -117,7 +117,8 @@ } .scroll { width: 100%; - height: calc(100% - 30%); + height: calc(100% - 40%); + // background: red; overflow: hidden; display: inline-block; } diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 2e1d0ab..ec67bc8 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -87,7 +87,7 @@ /> - + @@ -134,13 +134,13 @@ - + @@ -216,6 +216,15 @@ { value: '1', label: '已激活' }, { value: '2', label: '未激活' }, ]); +const weekList = ref([ + { value: '1', label: '周日' }, + { value: '2', label: '周一' }, + { value: '3', label: '周二' }, + { value: '4', label: '周三' }, + { value: '5', label: '周四' }, + { value: '6', label: '周五' }, + { value: '7', label: '周六' }, +]); const userList = ref([]); const loading = ref(true); const total = ref(1); @@ -245,6 +254,7 @@ patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }], reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }], eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }], + patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }], }, }); const { queryParams, form, rules } = toRefs(AllData); @@ -341,6 +351,7 @@ form.value.patrolUserList = form.value.patrolUserList.map(obj => { return { userId: String(obj.userId) }; }); + form.value.basicInfoId = '1686274734091489284'; // console.log(form.value, 'form.value'); patrolPlanadd(form.value).then(response => { diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue index 2e96fa9..6e29cf0 100644 --- a/src/views/publicService/quesNaire.vue +++ b/src/views/publicService/quesNaire.vue @@ -50,7 +50,9 @@ > 删除 - 满意度统计 + + 满意度统计 + @@ -93,7 +95,7 @@ @@ -195,6 +197,7 @@ const dialogShowAns = ref(false); const allData = reactive({ + ifStartQy: '', queryParams: { pageNum: 1, pageSize: 10, @@ -243,6 +246,12 @@ tableLoading.value = true; quesNairePage(queryParams.value).then(response => { tableData.value = response.data; + response.data.forEach(element => { + if (element.ifStart == 0) { + allData.ifStartQy = element.ifStart; + console.log(allData.ifStartQy, ' allData.ifStartQy'); + } + }); total.value = response.total; tableLoading.value = false; }); diff --git a/src/views/sponeScreen/longYW/InspectionTasks.vue b/src/views/sponeScreen/longYW/InspectionTasks.vue index 6f8a5a7..9a1c9b3 100644 --- a/src/views/sponeScreen/longYW/InspectionTasks.vue +++ b/src/views/sponeScreen/longYW/InspectionTasks.vue @@ -86,7 +86,7 @@ } .scroll { width: 100%; - height: calc(100% - 20%); + height: calc(100% - 32%); overflow: hidden; display: inline-block; } diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue index 65c8774..3896dd6 100644 --- a/src/views/sponeScreen/longYW/ManualSampling.vue +++ b/src/views/sponeScreen/longYW/ManualSampling.vue @@ -123,7 +123,7 @@ .longYW { margin-top: 10px; width: 460px; - height: 31%; + height: 32.5%; background: #004565; opacity: 0.8; .ConstrucClass { @@ -164,11 +164,12 @@ } } .box-body { - height: 88%; + height: 80%; // background: yellowgreen; padding: 10px; .scrollMapHM { - height: 100%; + height: 95%; + // background: #013a73; p { width: 18%; // background: red; @@ -178,9 +179,11 @@ } .scroll { width: 100%; - height: calc(100% - 30%); + height: calc(100% - 40%); overflow: hidden; + overflow-y: auto; display: inline-block; + // background: red; } } } diff --git a/src/views/sponeScreen/longYW/MonitoringStation.vue b/src/views/sponeScreen/longYW/MonitoringStation.vue index db91dc6..575fc49 100644 --- a/src/views/sponeScreen/longYW/MonitoringStation.vue +++ b/src/views/sponeScreen/longYW/MonitoringStation.vue @@ -71,7 +71,7 @@ .longYW { margin-top: 10px; width: 100%; - height: 31%; + height: 32.5%; background: #004565; opacity: 0.8; } @@ -117,7 +117,8 @@ } .scroll { width: 100%; - height: calc(100% - 30%); + height: calc(100% - 40%); + // background: red; overflow: hidden; display: inline-block; } diff --git a/src/views/sponeScreen/longYW/PromotionTraining.vue b/src/views/sponeScreen/longYW/PromotionTraining.vue index 263489c..cc12358 100644 --- a/src/views/sponeScreen/longYW/PromotionTraining.vue +++ b/src/views/sponeScreen/longYW/PromotionTraining.vue @@ -54,7 +54,7 @@ .longYW { margin-top: 10px; width: 460px; - height: 31%; + height: 30%; background: #004565; opacity: 0.8; .ConstrucClass { diff --git a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue index 2e1d0ab..ec67bc8 100644 --- a/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue +++ b/src/views/longoPeration/Patrolmanagement/Inspectionplan.vue @@ -87,7 +87,7 @@ /> - + @@ -134,13 +134,13 @@ - + @@ -216,6 +216,15 @@ { value: '1', label: '已激活' }, { value: '2', label: '未激活' }, ]); +const weekList = ref([ + { value: '1', label: '周日' }, + { value: '2', label: '周一' }, + { value: '3', label: '周二' }, + { value: '4', label: '周三' }, + { value: '5', label: '周四' }, + { value: '6', label: '周五' }, + { value: '7', label: '周六' }, +]); const userList = ref([]); const loading = ref(true); const total = ref(1); @@ -245,6 +254,7 @@ patrolUserList: [{ required: true, message: '请选择巡查人员', trigger: 'blur' }], reportTime1: [{ required: true, message: '请选择计划日期', trigger: 'blur' }], eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }], + patrolWeekDay: [{ required: true, message: '请选择巡查频率(周)', trigger: 'blur' }], }, }); const { queryParams, form, rules } = toRefs(AllData); @@ -341,6 +351,7 @@ form.value.patrolUserList = form.value.patrolUserList.map(obj => { return { userId: String(obj.userId) }; }); + form.value.basicInfoId = '1686274734091489284'; // console.log(form.value, 'form.value'); patrolPlanadd(form.value).then(response => { diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue index 2e96fa9..6e29cf0 100644 --- a/src/views/publicService/quesNaire.vue +++ b/src/views/publicService/quesNaire.vue @@ -50,7 +50,9 @@ > 删除 - 满意度统计 + + 满意度统计 + @@ -93,7 +95,7 @@ @@ -195,6 +197,7 @@ const dialogShowAns = ref(false); const allData = reactive({ + ifStartQy: '', queryParams: { pageNum: 1, pageSize: 10, @@ -243,6 +246,12 @@ tableLoading.value = true; quesNairePage(queryParams.value).then(response => { tableData.value = response.data; + response.data.forEach(element => { + if (element.ifStart == 0) { + allData.ifStartQy = element.ifStart; + console.log(allData.ifStartQy, ' allData.ifStartQy'); + } + }); total.value = response.total; tableLoading.value = false; }); diff --git a/src/views/sponeScreen/longYW/InspectionTasks.vue b/src/views/sponeScreen/longYW/InspectionTasks.vue index 6f8a5a7..9a1c9b3 100644 --- a/src/views/sponeScreen/longYW/InspectionTasks.vue +++ b/src/views/sponeScreen/longYW/InspectionTasks.vue @@ -86,7 +86,7 @@ } .scroll { width: 100%; - height: calc(100% - 20%); + height: calc(100% - 32%); overflow: hidden; display: inline-block; } diff --git a/src/views/sponeScreen/longYW/ManualSampling.vue b/src/views/sponeScreen/longYW/ManualSampling.vue index 65c8774..3896dd6 100644 --- a/src/views/sponeScreen/longYW/ManualSampling.vue +++ b/src/views/sponeScreen/longYW/ManualSampling.vue @@ -123,7 +123,7 @@ .longYW { margin-top: 10px; width: 460px; - height: 31%; + height: 32.5%; background: #004565; opacity: 0.8; .ConstrucClass { @@ -164,11 +164,12 @@ } } .box-body { - height: 88%; + height: 80%; // background: yellowgreen; padding: 10px; .scrollMapHM { - height: 100%; + height: 95%; + // background: #013a73; p { width: 18%; // background: red; @@ -178,9 +179,11 @@ } .scroll { width: 100%; - height: calc(100% - 30%); + height: calc(100% - 40%); overflow: hidden; + overflow-y: auto; display: inline-block; + // background: red; } } } diff --git a/src/views/sponeScreen/longYW/MonitoringStation.vue b/src/views/sponeScreen/longYW/MonitoringStation.vue index db91dc6..575fc49 100644 --- a/src/views/sponeScreen/longYW/MonitoringStation.vue +++ b/src/views/sponeScreen/longYW/MonitoringStation.vue @@ -71,7 +71,7 @@ .longYW { margin-top: 10px; width: 100%; - height: 31%; + height: 32.5%; background: #004565; opacity: 0.8; } @@ -117,7 +117,8 @@ } .scroll { width: 100%; - height: calc(100% - 30%); + height: calc(100% - 40%); + // background: red; overflow: hidden; display: inline-block; } diff --git a/src/views/sponeScreen/longYW/PromotionTraining.vue b/src/views/sponeScreen/longYW/PromotionTraining.vue index 263489c..cc12358 100644 --- a/src/views/sponeScreen/longYW/PromotionTraining.vue +++ b/src/views/sponeScreen/longYW/PromotionTraining.vue @@ -54,7 +54,7 @@ .longYW { margin-top: 10px; width: 460px; - height: 31%; + height: 30%; background: #004565; opacity: 0.8; .ConstrucClass { diff --git a/src/views/sponeScreen/longYW/SewageBOD.vue b/src/views/sponeScreen/longYW/SewageBOD.vue index 1516055..ee1ed12 100644 --- a/src/views/sponeScreen/longYW/SewageBOD.vue +++ b/src/views/sponeScreen/longYW/SewageBOD.vue @@ -57,7 +57,7 @@ .longYW { margin-top: 10px; width: 100%; - height: 31%; + height: 30%; background: #004565; opacity: 0.8; .head-right {