diff --git a/project/biaopin/dv/weiyang/AppDvWeiyang.vue b/project/biaopin/dv/weiyang/AppDvWeiyang.vue index e9ba5018..93571adb 100644 --- a/project/biaopin/dv/weiyang/AppDvWeiyang.vue +++ b/project/biaopin/dv/weiyang/AppDvWeiyang.vue @@ -7,6 +7,7 @@ import ValueUnit from "./comps/valueUnit.vue"; import ChargingPercent from "./comps/chargingPercent.vue"; import AiEchart from "dui/packages/tools/AiEchart.vue"; import NavTabs from "./comps/navTabs.vue"; +import AiEchartMap from "dui/packages/tools/AiEchartMap.vue"; const handlePercent = v => parseFloat(isNaN(v) ? 0 : v.toFixed(2)) const calcComparePercent = (v = 1, target = 1) => { @@ -147,7 +148,7 @@ const residentGroupTrend = { } export default { name: "AppDvWeiyang", - components: {NavTabs, AiEchart, ChargingPercent, ValueUnit, IconSmallPanel, IconStaPanel, SubHeader}, + components: {AiEchartMap, NavTabs, AiEchart, ChargingPercent, ValueUnit, IconSmallPanel, IconStaPanel, SubHeader}, label: "未央最新定制大屏", props: { instance: Function, @@ -161,12 +162,12 @@ export default { sta: {}, chart: {aiTrend, workChain, residentDistribution, spDistribution, wotDistribution, integralOrder, residentGroupTrend}, chartData: {}, - tableData: {} + tableData: {}, } }, computed: { ...mapState(["user"]), - currentAreaId: v => "610112010017" || v.areaId || v.user.info.areaId, + currentAreaId: v => "" || v.areaId || v.user.info.areaId, isLastAreaLevel: v => !/0{3}$/.test(v.currentAreaId), areaSta: v => [ {label: "社区数", icon: "66d80346ec1ea", prop: "communityCount", unit: "个"}, @@ -413,44 +414,37 @@ export default { -
- + -
-
- -
-
- - -
- - -
-
- -
-
- - - + + + +
+ +
+ + +
+
+ +
+
+ + -
-
- -
- + + +
-
-
- + +
-
+
@@ -464,9 +458,10 @@ export default { } } } + @font-face { - font-family: "DINAlternate-Bold"; - src: url("https://cdn.cunwuyun.cn/fonts/D-DIN-PRO-700-Bold.otf"); + font-family: "DINAlternate"; + src: url("https://cdn.cunwuyun.cn/fonts/D-DIN-PRO-500-Medium.otf"); }