diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 35db68c..cfc1257 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -837,7 +837,7 @@ "shuiWeuJianCe", "ysbz" ], - "text-allow-overlap": false, + "text-allow-overlap": true, "icon-allow-overlap": true, "icon-anchor": "center", "icon-size": 0.8, diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 35db68c..cfc1257 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -837,7 +837,7 @@ "shuiWeuJianCe", "ysbz" ], - "text-allow-overlap": false, + "text-allow-overlap": true, "icon-allow-overlap": true, "icon-anchor": "center", "icon-size": 0.8, diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue index 3394a91..8c4bfbf 100644 --- a/src/views/DialogTabs/component/GongDanPaiFa.vue +++ b/src/views/DialogTabs/component/GongDanPaiFa.vue @@ -92,19 +92,6 @@ .catch((err) => { console.log("🚀 ~ alarmWorkOrderAdd ~ err:", err); }); - - // unitVoiceTemplateCall({ - // robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd', - // phones: '13129919657,13638648812,13332926003', - // templateDesc: { - // title: '延安城市生命线通知', - // // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`, - // notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`, - // }, - // }).then(response => { - // proxy.$modal.msgSuccess('派发成功'); - // bus.emit('publicDialog_Close'); - // }); }; // 工单信息 diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 35db68c..cfc1257 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -837,7 +837,7 @@ "shuiWeuJianCe", "ysbz" ], - "text-allow-overlap": false, + "text-allow-overlap": true, "icon-allow-overlap": true, "icon-anchor": "center", "icon-size": 0.8, diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue index 3394a91..8c4bfbf 100644 --- a/src/views/DialogTabs/component/GongDanPaiFa.vue +++ b/src/views/DialogTabs/component/GongDanPaiFa.vue @@ -92,19 +92,6 @@ .catch((err) => { console.log("🚀 ~ alarmWorkOrderAdd ~ err:", err); }); - - // unitVoiceTemplateCall({ - // robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd', - // phones: '13129919657,13638648812,13332926003', - // templateDesc: { - // title: '延安城市生命线通知', - // // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`, - // notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`, - // }, - // }).then(response => { - // proxy.$modal.msgSuccess('派发成功'); - // bus.emit('publicDialog_Close'); - // }); }; // 工单信息 diff --git a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue index fa5a1b0..1be888e 100644 --- a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue +++ b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue @@ -16,12 +16,7 @@
预警类型:
- +
@@ -50,49 +45,49 @@ diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 35db68c..cfc1257 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -837,7 +837,7 @@ "shuiWeuJianCe", "ysbz" ], - "text-allow-overlap": false, + "text-allow-overlap": true, "icon-allow-overlap": true, "icon-anchor": "center", "icon-size": 0.8, diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue index 3394a91..8c4bfbf 100644 --- a/src/views/DialogTabs/component/GongDanPaiFa.vue +++ b/src/views/DialogTabs/component/GongDanPaiFa.vue @@ -92,19 +92,6 @@ .catch((err) => { console.log("🚀 ~ alarmWorkOrderAdd ~ err:", err); }); - - // unitVoiceTemplateCall({ - // robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd', - // phones: '13129919657,13638648812,13332926003', - // templateDesc: { - // title: '延安城市生命线通知', - // // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`, - // notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`, - // }, - // }).then(response => { - // proxy.$modal.msgSuccess('派发成功'); - // bus.emit('publicDialog_Close'); - // }); }; // 工单信息 diff --git a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue index fa5a1b0..1be888e 100644 --- a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue +++ b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue @@ -16,12 +16,7 @@
预警类型:
- +
@@ -50,49 +45,49 @@ diff --git a/src/views/oneMap/SmartDrainage/PsLeftBox.vue b/src/views/oneMap/SmartDrainage/PsLeftBox.vue index fd6283a..9c5a50e 100644 --- a/src/views/oneMap/SmartDrainage/PsLeftBox.vue +++ b/src/views/oneMap/SmartDrainage/PsLeftBox.vue @@ -22,12 +22,7 @@
{{ item.num }} @@ -48,13 +43,7 @@ {{ partName }} 位置
- +
  • @@ -496,11 +467,7 @@ height: 38px; width: 430px; margin: 0 auto; - background: linear-gradient( - 0deg, - rgba(22, 193, 216, 0.8) 0%, - rgba(0, 43, 67, 0.8) 100% - ); + background: linear-gradient(0deg, rgba(22, 193, 216, 0.8) 0%, rgba(0, 43, 67, 0.8) 100%); border-radius: 6px; border: 1px solid #15d2fd; display: flex; @@ -524,7 +491,7 @@ // justify-content: space-between; align-items: center; margin-top: 2px; - background: url("@/assets/images/zhps/liebiao.png") no-repeat; + background: url('@/assets/images/zhps/liebiao.png') no-repeat; background-size: 100% 100%; .tableBodyList_span1 { width: 10%; @@ -563,7 +530,7 @@ } } .activedright { - background: url("@/assets/images/zhps/lbxz.png") no-repeat; + background: url('@/assets/images/zhps/lbxz.png') no-repeat; background-size: 100% 100%; } } @@ -616,7 +583,7 @@ .rainend { width: 440px; height: 85%; - background: url("@/assets/images/zhps/hsRain.png") no-repeat; + background: url('@/assets/images/zhps/hsRain.png') no-repeat; background-size: 100% 100%; } .rainLegend { @@ -664,7 +631,7 @@ height: 44px; line-height: 50px; width: 98%; - background: url("@/assets/newImgs/partBg.png") no-repeat; + background: url('@/assets/newImgs/partBg.png') no-repeat; background-size: 100% 100%; display: flex; align-items: center; diff --git a/public/static/libs/mapbox/style/floodOneMap.json b/public/static/libs/mapbox/style/floodOneMap.json index 35db68c..cfc1257 100644 --- a/public/static/libs/mapbox/style/floodOneMap.json +++ b/public/static/libs/mapbox/style/floodOneMap.json @@ -837,7 +837,7 @@ "shuiWeuJianCe", "ysbz" ], - "text-allow-overlap": false, + "text-allow-overlap": true, "icon-allow-overlap": true, "icon-anchor": "center", "icon-size": 0.8, diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue index 3394a91..8c4bfbf 100644 --- a/src/views/DialogTabs/component/GongDanPaiFa.vue +++ b/src/views/DialogTabs/component/GongDanPaiFa.vue @@ -92,19 +92,6 @@ .catch((err) => { console.log("🚀 ~ alarmWorkOrderAdd ~ err:", err); }); - - // unitVoiceTemplateCall({ - // robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd', - // phones: '13129919657,13638648812,13332926003', - // templateDesc: { - // title: '延安城市生命线通知', - // // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`, - // notice: `在${form.value.wranLocation}出现了${form.value.assessment},请于${form.value.requestFeedbackHour}进行确认与反馈`, - // }, - // }).then(response => { - // proxy.$modal.msgSuccess('派发成功'); - // bus.emit('publicDialog_Close'); - // }); }; // 工单信息 diff --git a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue index fa5a1b0..1be888e 100644 --- a/src/views/DialogTabs/component/RQ_FengXianJianCe.vue +++ b/src/views/DialogTabs/component/RQ_FengXianJianCe.vue @@ -16,12 +16,7 @@
    预警类型:
    - +
    @@ -50,49 +45,49 @@ diff --git a/src/views/oneMap/SmartDrainage/PsLeftBox.vue b/src/views/oneMap/SmartDrainage/PsLeftBox.vue index fd6283a..9c5a50e 100644 --- a/src/views/oneMap/SmartDrainage/PsLeftBox.vue +++ b/src/views/oneMap/SmartDrainage/PsLeftBox.vue @@ -22,12 +22,7 @@
    {{ item.num }} @@ -48,13 +43,7 @@ {{ partName }} 位置
    - +
  • @@ -496,11 +467,7 @@ height: 38px; width: 430px; margin: 0 auto; - background: linear-gradient( - 0deg, - rgba(22, 193, 216, 0.8) 0%, - rgba(0, 43, 67, 0.8) 100% - ); + background: linear-gradient(0deg, rgba(22, 193, 216, 0.8) 0%, rgba(0, 43, 67, 0.8) 100%); border-radius: 6px; border: 1px solid #15d2fd; display: flex; @@ -524,7 +491,7 @@ // justify-content: space-between; align-items: center; margin-top: 2px; - background: url("@/assets/images/zhps/liebiao.png") no-repeat; + background: url('@/assets/images/zhps/liebiao.png') no-repeat; background-size: 100% 100%; .tableBodyList_span1 { width: 10%; @@ -563,7 +530,7 @@ } } .activedright { - background: url("@/assets/images/zhps/lbxz.png") no-repeat; + background: url('@/assets/images/zhps/lbxz.png') no-repeat; background-size: 100% 100%; } } @@ -616,7 +583,7 @@ .rainend { width: 440px; height: 85%; - background: url("@/assets/images/zhps/hsRain.png") no-repeat; + background: url('@/assets/images/zhps/hsRain.png') no-repeat; background-size: 100% 100%; } .rainLegend { @@ -664,7 +631,7 @@ height: 44px; line-height: 50px; width: 98%; - background: url("@/assets/newImgs/partBg.png") no-repeat; + background: url('@/assets/newImgs/partBg.png') no-repeat; background-size: 100% 100%; display: flex; align-items: center; diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue index 8a9313c..2daa062 100644 --- a/src/views/oneMap/components/ZHRQ.vue +++ b/src/views/oneMap/components/ZHRQ.vue @@ -2,34 +2,18 @@
    -
    +
    -
    - 管道风险评估 -
    +
    管道风险评估
    - + 燃气管道 4549km
    - + 需改造 1922km
    @@ -70,9 +54,7 @@
    - {{ - item.zb - }} + {{ item.zb }} {{ item.sz }} @@ -80,15 +62,13 @@ - {{ item.zt == 0 ? "预警" : "正常" }} + {{ + item.zt == 0 ? '预警' : '正常' + }} 派发
    -
    更新时间:2024-09-27 10:00
    +
    更新时间:2024-10:25 10:00
    @@ -109,17 +89,11 @@
  • -
    +
    辅助决策
    -
    +
    风险区域: {{ item.wranLocation }} @@ -137,16 +111,10 @@ {{ item.assessment }}
    - 工单派发 - 现场联线
    @@ -157,18 +125,12 @@
    预警处置
    -
    - 未处理 -
    -
    - 已处理 -
    +
    未处理
    +
    已处理
    - {{ - item.name - }} + {{ item.name }}
    {{ item.num1 }}
    {{ item.num2 }}
    @@ -242,119 +204,113 @@
    --> -
    - 发布预警 -
    +
    发布预警