Skip to content

E
east-nanjing-new
Commit a41532e3 authored by zhangrui123's avatar zhangrui123
Browse files
Options

修改重点工作的词云,不要倾斜度

parent dd232fe2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1299 additions and 169 deletions
dist.zip deleted 100644 → 0
View file @ dd232fe2
File deleted
dist/assets/main.82789f39.css → dist/assets/main.2a8380e3.css
View file @ a41532e3
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/assets/new-community.07a6b6a6.js → dist/assets/new-community.78e16455.js
View file @ a41532e3
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/assets/site-selector.7b01fdc3.js → dist/assets/site-selector.a28b1750.js
View file @ a41532e3
import{P as _,Q as i,av as w,U as v,a2 as s,V as r,$ as l,Y as y,X as u,a1 as V,a0 as h,aw as S,a3 as p,W as N,ac as T,a4 as g}from"./index.0e25ff90.js";const C=_({name:"SiteSelector",setup(){const e=i(()=>s.state.curView.type),n=i(()=>[...s.state.viewOptions,...s.state.communityOptions]),t=w();return{curViewType:e,options:n,handleChange:a=>{s.commit("SET_CURRENT_VIEW",n.value.find(c=>a===c.type)),s.state.curView.id&&s.dispatch("initStationData",s.state.curView.id),console.log(a),isNaN(+a)&&a!="lfs"?t.push({name:"main"}):isNaN(+a)&&a=="lfs"?t.push({name:"raffles"}):t.push({name:"community",query:{id:a}})}}}});function $(e,n,t,m,a,c){const d=p("a-select-option"),f=p("a-select");return r(),l("div",{id:"site-selector",class:"site-selector",style:S(`left:${isNaN(+e.curViewType)&&e.curViewType!="lfs"?"calc(20vw + .1rem)":isNaN(+e.curViewType)&&e.curViewType=="lfs"?"calc(32vw + .1rem)":"calc(16vw + .1rem)"}`)},[y(f,{value:e.curViewType,"dropdown-class-name":"site-selector-drop-down",onSelect:e.handleChange},{default:u(()=>[(r(!0),l(V,null,h(e.options,o=>(r(),N(d,{key:o.type,value:o.type},{default:u(()=>[T(g(o.name),1)]),_:2},1032,["value"]))),128))]),_:1},8,["value","onSelect"])],4)}var E=v(C,[["render",$]]);export{E as S}; import{P as _,Q as i,av as w,U as v,a2 as s,V as r,$ as l,Y as y,X as u,a1 as V,a0 as h,aw as S,a3 as p,W as N,ac as T,a4 as g}from"./index.1c49c616.js";const C=_({name:"SiteSelector",setup(){const e=i(()=>s.state.curView.type),n=i(()=>[...s.state.viewOptions,...s.state.communityOptions]),t=w();return{curViewType:e,options:n,handleChange:a=>{s.commit("SET_CURRENT_VIEW",n.value.find(c=>a===c.type)),s.state.curView.id&&s.dispatch("initStationData",s.state.curView.id),console.log(a),isNaN(+a)&&a!="lfs"?t.push({name:"main"}):isNaN(+a)&&a=="lfs"?t.push({name:"raffles"}):t.push({name:"community",query:{id:a}})}}}});function $(e,n,t,m,a,c){const d=p("a-select-option"),f=p("a-select");return r(),l("div",{id:"site-selector",class:"site-selector",style:S(`left:${isNaN(+e.curViewType)&&e.curViewType!="lfs"?"calc(20vw + .1rem)":isNaN(+e.curViewType)&&e.curViewType=="lfs"?"calc(32vw + .1rem)":"calc(16vw + .1rem)"}`)},[y(f,{value:e.curViewType,"dropdown-class-name":"site-selector-drop-down",onSelect:e.handleChange},{default:u(()=>[(r(!0),l(V,null,h(e.options,o=>(r(),N(d,{key:o.type,value:o.type},{default:u(()=>[T(g(o.name),1)]),_:2},1032,["value"]))),128))]),_:1},8,["value","onSelect"])],4)}var E=v(C,[["render",$]]);export{E as S};
dist/index.html
View file @ a41532e3
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<link rel="icon" href="./favicon.ico" /> <link rel="icon" href="./favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>南京东路街道</title> <title>南京东路街道</title>
<script type="module" crossorigin src="./assets/index.0e25ff90.js"></script> <script type="module" crossorigin src="./assets/index.1c49c616.js"></script>
<link rel="stylesheet" href="./assets/index.66ef0ac0.css"> <link rel="stylesheet" href="./assets/index.3c4c46ef.css">
</head> </head>
<body> <body>
......
src/store/actions.ts
View file @ a41532e3
This diff is collapsed.
src/store/state.ts
View file @ a41532e3
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
{ name: '第一工作站', type: 'work1', id: '01001' }, { name: '第一工作站', type: 'work1', id: '01001' },
{ name: '第二工作站', type: 'work2', id: '01002' }, { name: '第二工作站', type: 'work2', id: '01002' },
{ name: '第三工作站', type: 'work3', id: '01003' }, { name: '第三工作站', type: 'work3', id: '01003' },
{ name: '来福士专题屏', type: 'lfs' }, // { name: '来福士专题屏', type: 'lfs' },
// {name: "振兴小区", type: url: "/community?id=527635870583459840"} // {name: "振兴小区", type: url: "/community?id=527635870583459840"}
// {name: "威海路62弄", type: url: "/community?id=527635870583459841"} // {name: "威海路62弄", type: url: "/community?id=527635870583459841"}
], ],
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
communityOptions: [ communityOptions: [
// 小区选项 // 小区选项
{ name: '振兴小区', type: '527635870583459840' }, { name: '振兴小区', type: '527635870583459840' },
{ name: '威海路62弄', type: '527635870583459841' }, // { name: '威海路62弄', type: '527635870583459841' },
], ],
curTheme: 'manage', // 街道屏下当前主题（公共管理、公共服务、公共安全） curTheme: 'manage', // 街道屏下当前主题（公共管理、公共服务、公共安全）
zhenxing: { zhenxing: {
......
src/view/left/command.vue
View file @ a41532e3
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
<Summary :list="partySummary" :avatar="avatar6" /> <Summary :list="partySummary" :avatar="avatar6" />
<m-sub2>物业"三驾马车"</m-sub2> <m-sub2>物业"三驾马车"</m-sub2>
<Brief :list="propertySummary.slice(0, 3)" color="#fff" /> <Brief :list="propertySummary.slice(0, 3)" color="#fff" />
<m-sub2 :addition="{ value: propertySummary[3].value }"> <!-- <m-sub2 :addition="{ value: propertySummary[3].value }">
交叉任职 交叉任职
</m-sub2> </m-sub2> -->
</div> </div>
</div> </div>
</m-card> </m-card>
...@@ -201,12 +201,14 @@ export default defineComponent({ ...@@ -201,12 +201,14 @@ export default defineComponent({
}, },
{ {
name: '业委会', name: '业委会',
value: ywh || 0, // value: ywh || 0,
value: 43,
icon: icon37, icon: icon37,
}, },
{ {
name: '物业企业', name: '物业企业',
value: wy || 0, // value: wy || 0,
value: 87,
icon: icon38, icon: icon38,
}, },
{ {
......
src/view/right/beauty-home-in-station.vue
View file @ a41532e3
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</m-sub2> </m-sub2>
<m-sub2>马桶改造</m-sub2> <m-sub2>马桶改造</m-sub2>
<Brief :list="toiletSituation" color="#fff" /> <Brief :list="toiletSituation" color="#fff" />
<m-progress <!-- <m-progress
:value="rate || 0" :value="rate || 0"
:color="['rgba(253,211,116,.15)', '#F7933E']" :color="['rgba(253,211,116,.15)', '#F7933E']"
:msg="{ :msg="{
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
name: '改造进度', name: '改造进度',
color: '#fff', color: '#fff',
}" }"
/> /> -->
</div> </div>
</m-card> </m-card>
<m-modal <m-modal
...@@ -88,13 +88,31 @@ export default defineComponent({ ...@@ -88,13 +88,31 @@ export default defineComponent({
.then((res) => { .then((res) => {
const data = res?.data?.content || [] const data = res?.data?.content || []
const beautyHomeTypes: any[] = [] const beautyHomeTypes: any[] = []
summary.value = data.map((item: any) => { // summary.value = data.map((item: any) => {
beautyHomeTypes.push(...item.statistics) // beautyHomeTypes.push(...item.statistics)
return { // return {
name: item.implementYear + '年', // name: item.implementYear + '年',
value: item.num || 0, // value: item.num || 0,
} // }
}) // })
summary.value = [
{
name: '2019年',
value: '6',
},
{
name: '2020年',
value: '5',
},
{
name: '2021年',
value: '5',
},
{
name: '2022年',
value: '2',
},
]
beautyHome.value = beautyHomeTypes beautyHome.value = beautyHomeTypes
}) })
...@@ -110,8 +128,9 @@ export default defineComponent({ ...@@ -110,8 +128,9 @@ export default defineComponent({
totalNum += item.totalNum || 0 totalNum += item.totalNum || 0
completeNum += item.completeNum || 0 completeNum += item.completeNum || 0
}) })
toiletSituation.value[0].value = completeNum toiletSituation.value[0].value = 742
toiletSituation.value[1].value = totalNum // toiletSituation.value[0].value = completeNum
// toiletSituation.value[1].value = totalNum
rate.value = Math.round((completeNum / totalNum) * 100) rate.value = Math.round((completeNum / totalNum) * 100)
ajax ajax
.get({ .get({
...@@ -127,8 +146,27 @@ export default defineComponent({ ...@@ -127,8 +146,27 @@ export default defineComponent({
} }
result[e.cmtName] += 1 result[e.cmtName] += 1
}) })
elevList.value = data // elevList.value = data
elevAmount.value = data.length || 0 elevList.value = [
{
cmtName: '振兴',
num: 2,
},
{
cmtName: '江阴',
num: 2,
},
{
cmtName: '新昌',
num: 4,
},
{
cmtName: '小花园',
num: 2,
},
]
// elevAmount.value = data.length || 0
elevAmount.value = 10
}) })
} }
const situation = computed<BriefProp[]>(() => [ const situation = computed<BriefProp[]>(() => [
...@@ -137,7 +175,7 @@ export default defineComponent({ ...@@ -137,7 +175,7 @@ export default defineComponent({
value: value:
beautyHome.value beautyHome.value
.filter((e) => e.projectType == '小区微更新') .filter((e) => e.projectType == '小区微更新')
?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 0, ?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 16,
icon: icon31, icon: icon31,
}, },
{ {
...@@ -145,7 +183,7 @@ export default defineComponent({ ...@@ -145,7 +183,7 @@ export default defineComponent({
value: value:
beautyHome.value beautyHome.value
.filter((e) => e.projectType == '门岗规范化') .filter((e) => e.projectType == '门岗规范化')
?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 0, ?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 15,
icon: icon32, icon: icon32,
}, },
{ {
...@@ -153,7 +191,7 @@ export default defineComponent({ ...@@ -153,7 +191,7 @@ export default defineComponent({
value: value:
beautyHome.value beautyHome.value
.filter((e) => e.projectType == '充电桩') .filter((e) => e.projectType == '充电桩')
?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 0, ?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 14,
icon: icon33, icon: icon33,
}, },
{ {
...@@ -161,13 +199,14 @@ export default defineComponent({ ...@@ -161,13 +199,14 @@ export default defineComponent({
value: value:
beautyHome.value beautyHome.value
.filter((e) => e.projectType == '雨污混接') .filter((e) => e.projectType == '雨污混接')
?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 0, ?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 8,
icon: icon34, icon: icon34,
}, },
]) ])
const toiletSituation = ref<BriefProp[]>([ const toiletSituation = ref<BriefProp[]>([
{ name: '已完成改造', value: 0, icon: icon35 }, // { name: '已完成改造', value: 0, icon: icon35 },
{ name: '应改造', value: 0, icon: icon36 }, // { name: '应改造', value: 0, icon: icon36 },
{ name: '剩余马桶未改造', value: 0, icon: icon36 },
]) ])
const rate = ref(0) const rate = ref(0)
const barData = computed(() => ({ const barData = computed(() => ({
...@@ -245,16 +284,16 @@ export default defineComponent({ ...@@ -245,16 +284,16 @@ export default defineComponent({
align-items flex-end align-items flex-end
width 20% width 20%
.count .count
font-size .14rem font-size 0.14rem
font-weight bold font-weight bold
color #FF6C2E color #FF6C2E
p p
font-size .09rem font-size 0.09rem
.sum-card .sum-card
display flex display flex
flex-wrap wrap flex-wrap wrap
&.work-station &.work-station
margin .05rem 0 margin 0.05rem 0
>div >div
width 20% width 20%
>div >div
...@@ -262,11 +301,11 @@ export default defineComponent({ ...@@ -262,11 +301,11 @@ export default defineComponent({
text-align center text-align center
position relative position relative
.count .count
font-size .12rem font-size 0.12rem
font-family $font-barlow font-family $font-barlow
p p
color #ccc color #ccc
font-size .09rem font-size 0.09rem
&:after &:after
content '|' content '|'
color $secondary-color color $secondary-color
...@@ -282,11 +321,11 @@ export default defineComponent({ ...@@ -282,11 +321,11 @@ export default defineComponent({
height 82vh height 82vh
overflow-y auto overflow-y auto
>div >div
border-bottom .01rem solid rgba(176,216,255,.1) border-bottom 0.01rem solid rgba(176, 216, 255, 0.1)
padding .05rem 0 padding 0.05rem 0
p p
font-size .09rem font-size 0.09rem
&:first-child &:first-child
font-size .11rem font-size 0.11rem
font-weight bold font-weight bold
</style> </style>
src/view/right/beauty-home.vue
View file @ a41532e3
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</div> </div>
<m-sub2>马桶改造</m-sub2> <m-sub2>马桶改造</m-sub2>
<Brief :list="toiletSituation" color="#fff" /> <Brief :list="toiletSituation" color="#fff" />
<m-progress <!-- <m-progress
v-if="show" v-if="show"
:value="rate" :value="rate"
:color="['rgba(253,211,116,.15)', '#F7933E']" :color="['rgba(253,211,116,.15)', '#F7933E']"
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
name: '改造进度', name: '改造进度',
color: '#fff', color: '#fff',
}" }"
/> /> -->
</div> </div>
</m-card> </m-card>
<m-modal <m-modal
...@@ -76,13 +76,35 @@ export default defineComponent({ ...@@ -76,13 +76,35 @@ export default defineComponent({
ajax.get({ url: api.GET_BEAUTY_HOME_EXECUTE }).then((res) => { ajax.get({ url: api.GET_BEAUTY_HOME_EXECUTE }).then((res) => {
const data = res?.data?.content || [] const data = res?.data?.content || []
const beautyHomeTypes: any[] = [] const beautyHomeTypes: any[] = []
summary.value = data.map((item: any) => { console.log(data)
beautyHomeTypes.push(...item.statistics) // summary.value = data.map((item: any) => {
return { // //根据后台返回的数据
name: item.implementYear + '年', // beautyHomeTypes.push(...item.statistics)
value: item.num || 0, // return {
} // name: item.implementYear + '年',
}) // value: item.num || 0,
// }
// })
summary.value = [
{
name: '2019年',
value: '6',
},
{
name: '2020年',
value: '5',
},
{
name: '2021年',
value: '5',
},
{
name: '2022年',
value: '2',
},
]
console.log(summary)
beautyHome.value = beautyHomeTypes beautyHome.value = beautyHomeTypes
}) })
const situation = computed<BriefProp[]>(() => [ const situation = computed<BriefProp[]>(() => [
...@@ -91,7 +113,7 @@ export default defineComponent({ ...@@ -91,7 +113,7 @@ export default defineComponent({
value: value:
beautyHome.value beautyHome.value
.filter((e) => e.projectType == '小区微更新') .filter((e) => e.projectType == '小区微更新')
?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 0, ?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 16, //这个默认的16是写死的,本来是0
icon: icon31, icon: icon31,
}, },
{ {
...@@ -99,7 +121,7 @@ export default defineComponent({ ...@@ -99,7 +121,7 @@ export default defineComponent({
value: value:
beautyHome.value beautyHome.value
.filter((e) => e.projectType == '门岗规范化') .filter((e) => e.projectType == '门岗规范化')
?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 0, ?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 14,//这个默认的14是写死的,本来是0
icon: icon32, icon: icon32,
}, },
{ {
...@@ -107,7 +129,7 @@ export default defineComponent({ ...@@ -107,7 +129,7 @@ export default defineComponent({
value: value:
beautyHome.value beautyHome.value
.filter((e) => e.projectType == '充电桩') .filter((e) => e.projectType == '充电桩')
?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 0, ?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 15, //这个默认的15是写死的,本来是0
icon: icon33, icon: icon33,
}, },
{ {
...@@ -115,7 +137,7 @@ export default defineComponent({ ...@@ -115,7 +137,7 @@ export default defineComponent({
value: value:
beautyHome.value beautyHome.value
.filter((e) => e.projectType == '雨污混接') .filter((e) => e.projectType == '雨污混接')
?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 0, ?.reduce((acc, cur) => acc + cur?.typeNum || 0, 0) || 8,//这个默认的8是写死的,本来是0
icon: icon34, icon: icon34,
}, },
]) ])
...@@ -139,11 +161,32 @@ export default defineComponent({ ...@@ -139,11 +161,32 @@ export default defineComponent({
result[e.cmtName] += 1 result[e.cmtName] += 1
}) })
elevList.value = Object.keys(result).map((key: string) => ({ // elevList.value = Object.keys(result).map((key: string) => ({ 原本的数据
cmtName: key, // cmtName: key,
num: result[key], // num: result[key],
})) // }))
elevAmount.value = data.length || 0 elevList.value = [
{
cmtName: '振兴',
num: 2,
},
{
cmtName: '江阴',
num: 2,
},
{
cmtName: '新昌',
num: 4,
},
{
cmtName: '小花园',
num: 2,
},
]
// 现在写死的数据
// elevAmount.value = data.length || 0 //原本数据
elevAmount.value = 10 //后面写死的数据
}) })
const handleSelect = async (name: string) => { const handleSelect = async (name: string) => {
curCmtName.value === name curCmtName.value === name
...@@ -164,8 +207,8 @@ export default defineComponent({ ...@@ -164,8 +207,8 @@ export default defineComponent({
showElevModal.value = true showElevModal.value = true
} }
const toiletSituation = ref<BriefProp[]>([ const toiletSituation = ref<BriefProp[]>([
{ name: '已完成改造', value: 0, icon: icon35 }, // { name: '已完成改造', value: 0, icon: icon35 },
{ name: '应改造', value: 0, icon: icon36 }, { name: '剩余马桶未改造', value: 0, icon: icon36 },
]) ])
const rate = ref(0) const rate = ref(0)
onMounted(async () => { onMounted(async () => {
...@@ -176,8 +219,9 @@ export default defineComponent({ ...@@ -176,8 +219,9 @@ export default defineComponent({
totalNum += item.totalNum || 0 totalNum += item.totalNum || 0
completeNum += item.completeNum || 0 completeNum += item.completeNum || 0
}) })
toiletSituation.value[0].value = completeNum toiletSituation.value[0].value = 742 //5月5号,南东改成静态数组,原本在下面
toiletSituation.value[1].value = totalNum // toiletSituation.value[0].value = completeNum
// toiletSituation.value[1].value = totalNum
rate.value = Math.round((completeNum / totalNum) * 100) rate.value = Math.round((completeNum / totalNum) * 100)
}) })
return { return {
...@@ -213,13 +257,13 @@ export default defineComponent({ ...@@ -213,13 +257,13 @@ export default defineComponent({
align-items center align-items center
justify-content space-around justify-content space-around
width 24% width 24%
padding .05rem padding 0.05rem
.count .count
font-size .14rem font-size 0.14rem
font-family $font-barlow font-family $font-barlow
margin-right .03rem margin-right 0.03rem
p p
font-size .09rem font-size 0.09rem
.sum-card .sum-card
display flex display flex
flex-wrap wrap flex-wrap wrap
...@@ -230,25 +274,24 @@ export default defineComponent({ ...@@ -230,25 +274,24 @@ export default defineComponent({
align-items center align-items center
width 49% width 49%
$card-bg2() $card-bg2()
padding 0 .1rem padding 0 0.1rem
margin-bottom .05rem margin-bottom 0.05rem
cursor pointer cursor pointer
transition all .3s ease transition all 0.3s ease
&:hover &:hover, &.on
&.on
$card-bg2(0.8, 0.4) $card-bg2(0.8, 0.4)
.count .count
font-size .12rem font-size 0.12rem
font-weight bold font-weight bold
.elev-modal .elev-modal
height 82vh height 82vh
overflow-y auto overflow-y auto
>div >div
border-bottom .01rem solid rgba(176,216,255,.1) border-bottom 0.01rem solid rgba(176, 216, 255, 0.1)
padding .05rem 0 padding 0.05rem 0
p p
font-size .09rem font-size 0.09rem
&:first-child &:first-child
font-size .11rem font-size 0.11rem
font-weight bold font-weight bold
</style> </style>
src/view/right/duty.vue
View file @ a41532e3
<template> <template>
<m-card title="勤务" mode="4"> <m-card title="勤务" mode="4">
<Brief class="brief" :list="summary" color="#F7933E" /> <Brief class="brief" :list="summary" color="#F7933E" />
<m-sub2>综合管理</m-sub2> <m-sub2> 综合管理 </m-sub2>
<div class="details"> <div class="details">
<m-scroll <m-scroll
v-if="show && caseList.length > 0" v-if="show && caseList.length > 0"
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</div> </div>
<div class="msg"> <div class="msg">
<p>{{ item.address }}</p> <p>{{ item.address }}</p>
<p>{{ item.acceptTime }}</p> <p>{{ /\d{4}-\d{1,2}-\d{1,2}/g.exec(item.acceptTime)[0] }}</p>
</div> </div>
<m-step :steps="steps" :current="steps.indexOf(item.status)" /> <m-step :steps="steps" :current="steps.indexOf(item.status)" />
</div> </div>
...@@ -98,7 +98,6 @@ export default defineComponent({ ...@@ -98,7 +98,6 @@ export default defineComponent({
<style lang="stylus" scoped> <style lang="stylus" scoped>
@import '../../components/MyComponent/main.styl' @import '../../components/MyComponent/main.styl'
.details .details
height 2.64rem height 2.64rem
overflow hidden overflow hidden
...@@ -106,27 +105,27 @@ export default defineComponent({ ...@@ -106,27 +105,27 @@ export default defineComponent({
display flex display flex
flex-direction column flex-direction column
justify-content space-between justify-content space-between
padding .05rem padding 0.05rem
height .84rem height 0.84rem
margin-top .04rem margin-top 0.04rem
box-sizing border-box box-sizing border-box
background rgba(70,83,97,.4) background rgba(70, 83, 97, 0.4)
box-shadow inset 0 .01rem .02rem 0 rgba(204,204,204,.2) box-shadow inset 0 0.01rem 0.02rem 0 rgba(204, 204, 204, 0.2)
border-radius .03rem border-radius 0.03rem
.title .title
display flex display flex
align-items center align-items center
p p
font-size .12rem font-size 0.12rem
&:last-child &:last-child
font-size .1rem font-size 0.1rem
span span
flex 1 flex 1
display block display block
border-bottom .01rem dashed $blue border-bottom 0.01rem dashed $blue
margin 0 .1rem margin 0 0.1rem
.msg .msg
$center() $center()
justify-content space-between justify-content space-between
font-size .08rem font-size 0.08rem
</style> </style>
src/view/right/ecology.vue
View file @ a41532e3
...@@ -155,6 +155,8 @@ export default defineComponent({ ...@@ -155,6 +155,8 @@ export default defineComponent({
} }
const businessPhotos = ref([photo1, photo2]) const businessPhotos = ref([photo1, photo2])
const photosList = computed(() => store.state.ecologyPhoto) const photosList = computed(() => store.state.ecologyPhoto)
console.log(photosList)
const photos1 = computed(() => const photos1 = computed(() =>
photosList.value.filter((e) => e.buildingType.includes('历保')) photosList.value.filter((e) => e.buildingType.includes('历保'))
) )
...@@ -184,7 +186,7 @@ export default defineComponent({ ...@@ -184,7 +186,7 @@ export default defineComponent({
width 100% width 100%
justify-content space-around justify-content space-around
flex-wrap wrap flex-wrap wrap
margin .05rem 0 margin 0.05rem 0
>div >div
$center() $center()
width 25% width 25%
...@@ -193,30 +195,30 @@ export default defineComponent({ ...@@ -193,30 +195,30 @@ export default defineComponent({
color #FF8635 color #FF8635
font-weight bold font-weight bold
.count .count
font-size .14rem font-size 0.14rem
font-family $font-barlow font-family $font-barlow
margin-right .08rem margin-right 0.08rem
.sum .sum
display flex display flex
flex-wrap wrap flex-wrap wrap
margin .05rem 0 margin 0.05rem 0
>div >div
display flex display flex
align-items center align-items center
width 25% width 25%
margin .02rem 0 margin 0.02rem 0
img img
width .26rem width 0.26rem
height @width height @width
margin 0 .1rem 0 .05rem margin 0 0.1rem 0 0.05rem
.count .count
font-size .14rem font-size 0.14rem
font-family $font-barlow font-family $font-barlow
p p
color #ccc color #ccc
.photos .photos
height .76rem height 0.76rem
margin-bottom .04rem margin-bottom 0.04rem
overflow hidden overflow hidden
.wrapper .wrapper
width 100% width 100%
...@@ -225,7 +227,7 @@ export default defineComponent({ ...@@ -225,7 +227,7 @@ export default defineComponent({
flex-wrap wrap flex-wrap wrap
.photo .photo
width 31% width 31%
height .76rem height 0.76rem
position relative position relative
background-repeat no-repeat background-repeat no-repeat
background-size cover background-size cover
...@@ -235,19 +237,19 @@ export default defineComponent({ ...@@ -235,19 +237,19 @@ export default defineComponent({
left 0 left 0
right 0 right 0
bottom 0 bottom 0
height .2rem height 0.2rem
line-height @height line-height @height
background rgba(0,0,0,0.6) background rgba(0, 0, 0, 0.6)
text-align center text-align center
overflow hidden overflow hidden
white-space nowrap white-space nowrap
text-overflow ellipsis text-overflow ellipsis
padding 0 .04rem padding 0 0.04rem
box-sizing border-box box-sizing border-box
.business .business
display flex display flex
justify-content space-between justify-content space-between
margin-bottom .02rem margin-bottom 0.02rem
.photo .photo
width 48% width 48%
height 1.1rem height 1.1rem
......
src/view/right/emergency-store.vue
View file @ a41532e3
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</div> </div>
<div class="bottom-box"> <div class="bottom-box">
<m-sub2>重点关注楼宇</m-sub2> <m-sub2>重点关注楼宇</m-sub2>
<a class="check-btn" @click="listModal = true">查看清单>></a> <!-- <a class="check-btn" @click="listModal = true">查看清单>></a> -->
<div class="content"> <div class="content">
<div v-for="item in buildings" :key="item.id"> <div v-for="item in buildings" :key="item.id">
<div> <div>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
@click="selectBuilding(item)" @click="selectBuilding(item)"
/> />
</div> </div>
<div class="secRow"> <!-- <div class="secRow">
<span> <span>
<span>隐患 </span> <span>隐患 </span>
<m-count <m-count
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
:value="item.outerWallFacilityDangerPoint" :value="item.outerWallFacilityDangerPoint"
/> />
</span> </span>
</div> </div> -->
</div> </div>
</div> </div>
</div> </div>
...@@ -144,13 +144,14 @@ export default defineComponent({ ...@@ -144,13 +144,14 @@ export default defineComponent({
const pieData = computed(() => store.state.pubulicSafePieData) const pieData = computed(() => store.state.pubulicSafePieData)
const outHouseWall = computed(() => store.state.pubulicSafeOutHouseWall) const outHouseWall = computed(() => store.state.pubulicSafeOutHouseWall)
const year = ref('2021') //年份 const year = ref('2022') //年份
const yearOptions = ref(['2021', '2020', '2019']) //年份option const yearOptions = ref(['2022', '2021', '2020', '2019']) //年份option
const houseSum = ref([ const houseSum = ref([
{ name: '检查楼数', value: 0 }, { name: '检查楼数', value: 0 },
{ name: '隐患点数', value: 0 }, { name: '隐患点数', value: 0 },
{ name: '危险点数', value: 0 }, { name: '危险点数', value: 0 },
]) ])
console.log(houseSum)
const pubulicSafeBuildings = computed( const pubulicSafeBuildings = computed(
() => store.state.pubulicSafeBuildings () => store.state.pubulicSafeBuildings
...@@ -220,6 +221,8 @@ export default defineComponent({ ...@@ -220,6 +221,8 @@ export default defineComponent({
//切换年份 //切换年份
const changeYear = (value: string) => { const changeYear = (value: string) => {
console.log(value)
year.value = value year.value = value
} }
...@@ -276,13 +279,19 @@ export default defineComponent({ ...@@ -276,13 +279,19 @@ export default defineComponent({
[() => outHouseWall.value, () => year.value], [() => outHouseWall.value, () => year.value],
([data, year]) => { ([data, year]) => {
if (data.length === 0) return if (data.length === 0) return
const { checkNum = 0, hiddenPoint = 0, dangerPoint = 0 } = console.log(data)
data?.find((e: any) => e.year === year) || {}
const {
checkNum = 0,
hiddenPoint = 0,
dangerPoint = 0,
} = data?.find((e: any) => e.year === year) || {}
houseSum.value = [ houseSum.value = [
{ name: '检查楼数', value: checkNum }, { name: '检查楼数', value: checkNum },
{ name: '隐患点数', value: hiddenPoint }, { name: '隐患点数', value: hiddenPoint },
{ name: '危险点数', value: dangerPoint }, { name: '危险点数', value: dangerPoint },
] ]
console.log(houseSum)
}, },
{ immediate: true } { immediate: true }
) )
...@@ -336,6 +345,7 @@ export default defineComponent({ ...@@ -336,6 +345,7 @@ export default defineComponent({
watch( watch(
[() => pieData.value, () => year.value], [() => pieData.value, () => year.value],
([data, year]) => { ([data, year]) => {
console.log(data)
if (data.length === 0) return if (data.length === 0) return
const curData = data.filter((item: any) => item.year === year) const curData = data.filter((item: any) => item.year === year)
const first: any = curData.find((item: any) => const first: any = curData.find((item: any) =>
...@@ -348,7 +358,11 @@ export default defineComponent({ ...@@ -348,7 +358,11 @@ export default defineComponent({
item.workstationName.includes('第三') item.workstationName.includes('第三')
) )
barData.value = [first, second, third] barData.value = [first, second, third]
console.log(barData.value)
// // 将第二张饼图的数据更新 // // 将第二张饼图的数据更新
console.log(info)
info.value = [ info.value = [
{ {
name: '第一工作站', name: '第一工作站',
...@@ -427,7 +441,6 @@ export default defineComponent({ ...@@ -427,7 +441,6 @@ export default defineComponent({
<style lang="stylus" scoped> <style lang="stylus" scoped>
@import '../../components/MyComponent/main.styl' @import '../../components/MyComponent/main.styl'
.wrapper .wrapper
height 100% height 100%
display flex display flex
...@@ -437,24 +450,24 @@ export default defineComponent({ ...@@ -437,24 +450,24 @@ export default defineComponent({
display flex display flex
align-items center align-items center
justify-content space-around justify-content space-around
background rgba(70,83,97,.4) background rgba(70, 83, 97, 0.4)
padding .08rem 0 padding 0.08rem 0
box-sizing border-box box-sizing border-box
>div >div
display flex display flex
align-items center align-items center
justify-content center justify-content center
cursor pointer cursor pointer
transition transform .3s ease-in-out transition transform 0.3s ease-in-out
&:hover &:hover
transform scale(1.1) transform scale(1.1)
span span
color $orange color $orange
.count .count
font-family $font-barlow font-family $font-barlow
font-size .16rem font-size 0.16rem
margin-right .04rem margin-right 0.04rem
margin-bottom .04rem margin-bottom 0.04rem
span span
color #ccc color #ccc
.out-house .out-house
...@@ -471,21 +484,21 @@ export default defineComponent({ ...@@ -471,21 +484,21 @@ export default defineComponent({
display flex display flex
align-items center align-items center
img img
width .3rem width 0.3rem
margin-right .05rem margin-right 0.05rem
.count .count
font-size .12rem font-size 0.12rem
font-family $font-barlow font-family $font-barlow
.chart .chart
width 75% width 75%
height 100% height 100%
.bottom-box .bottom-box
position relative position relative
margin-top .05rem margin-top 0.05rem
overflow-y auto overflow-y auto
.check-btn .check-btn
position absolute position absolute
right .1rem right 0.1rem
top 0 top 0
transform translateY(14%) transform translateY(14%)
.content .content
...@@ -495,12 +508,12 @@ export default defineComponent({ ...@@ -495,12 +508,12 @@ export default defineComponent({
height 1.8rem height 1.8rem
>div >div
width 31% width 31%
padding .05rem .08rem padding 0.05rem 0.08rem
margin-top .08rem margin-top 0.08rem
margin-right .06rem margin-right 0.06rem
border-radius .03rem border-radius 0.03rem
background linear-gradient(to right bottom, rgba(124,139,154,.3), rgba(70,83,97,.3)) background linear-gradient(to right bottom, rgba(124, 139, 154, 0.3), rgba(70, 83, 97, 0.3))
box-shadow 0 0 .4rem 0 rgba(45,51,66,.5) box-shadow 0 0 0.4rem 0 rgba(45, 51, 66, 0.5)
.count .count
font-size 0.12rem font-size 0.12rem
font-family $font-barlow font-family $font-barlow
...@@ -524,7 +537,7 @@ export default defineComponent({ ...@@ -524,7 +537,7 @@ export default defineComponent({
color #FF5C5C color #FF5C5C
.count .count
color #fff color #fff
margin-left .05rem margin-left 0.05rem
.view-selector .view-selector
float right float right
height 8% height 8%
......
src/view/right/house.vue
View file @ a41532e3
...@@ -90,10 +90,12 @@ export default defineComponent({ ...@@ -90,10 +90,12 @@ export default defineComponent({
}, },
{ {
name: '物业公司', name: '物业公司',
value: pubulicSafeHouse.value.company, // value: pubulicSafeHouse.value.company,
value: 87,
icon: icon38, icon: icon38,
}, },
{ name: '业委会', value: pubulicSafeHouse.value.ic, icon: icon37 }, // { name: '业委会', value: pubulicSafeHouse.value.ic, icon: icon37 },
{ name: '业委会', value: 43, icon: icon37 },
] ]
}) })
const houseTypes = computed(() => { const houseTypes = computed(() => {
......
src/view/right/key-task.vue
View file @ a41532e3
...@@ -100,8 +100,8 @@ export default defineComponent({ ...@@ -100,8 +100,8 @@ export default defineComponent({
{ {
type: 'wordCloud', type: 'wordCloud',
sizeRange: [sizeRate.value, sizeRate.value * 2], sizeRange: [sizeRate.value, sizeRate.value * 2],
rotationRange: [0, 90], rotationRange: [0, 0],
rotationStep: 45, rotationStep: 0,
gridSize: sizeRate.value, gridSize: sizeRate.value,
shape: 'pentagon', shape: 'pentagon',
width: '100%', width: '100%',
......
src/view/right/police.vue
View file @ a41532e3
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div> <div>
<m-sub2>平安地图</m-sub2> <m-sub2>平安地图</m-sub2>
<div class="safe-map"> <div class="safe-map">
<div> <!-- <div>
<p <p
v-for="(item, index) in safeMap" v-for="(item, index) in safeMap"
:key="item.cmtName" :key="item.cmtName"
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<span>{{ item.cmtName }}</span> <span>{{ item.cmtName }}</span>
<m-count class="count" :value="item.score" /> <m-count class="count" :value="item.score" />
</p> </p>
</div> </div> -->
<div> <div>
<img :src="mapPhoto" @click="openUrl" /> <img :src="mapPhoto" @click="openUrl" />
</div> </div>
...@@ -93,18 +93,18 @@ export default defineComponent({ ...@@ -93,18 +93,18 @@ export default defineComponent({
// () => store.state.pubulicSafeGateSenteryZhiguangongfang // () => store.state.pubulicSafeGateSenteryZhiguangongfang
() => [ () => [
{ name: '有出入口', value: 283 }, { name: '有出入口', value: 283 },
{ name: '已封闭', value: 130 }, { name: '已封闭', value: 0 },
{ name: '有门岗处', value: 54 }, { name: '有门岗处', value: 54 },
{ name: '有值守处', value: 86 }, { name: '有值守处', value: 216 },
] ]
) // 门岗值守数据 - 直管公房 ) // 门岗值守数据 - 直管公房
const shwyList = computed( const shwyList = computed(
// () => store.state.pubulicSafeGateSenteryShehuiwuye // () => store.state.pubulicSafeGateSenteryShehuiwuye
() => [ () => [
{ name: '有出入口', value: 23 }, { name: '有出入口', value: 23 },
{ name: '已封闭', value: 40 }, { name: '已封闭', value: 0 },
{ name: '有门岗处', value: 12 }, { name: '有门岗处', value: 12 },
{ name: '有值守处', value: 28 }, { name: '有值守处', value: 68 },
] ]
) // 门岗值守数据 - 社会物业 ) // 门岗值守数据 - 社会物业
const safeMap = computed(() => store.state.pubulicSafeMap) // 门岗值守数据 - 社会物业 const safeMap = computed(() => store.state.pubulicSafeMap) // 门岗值守数据 - 社会物业
...@@ -206,7 +206,7 @@ export default defineComponent({ ...@@ -206,7 +206,7 @@ export default defineComponent({
height 1.4rem height 1.4rem
margin 0.1rem 0 margin 0.1rem 0
.gate-wrapper .gate-wrapper
margin .1rem 0 margin 0.1rem 0
.gate .gate
margin-bottom 0.1rem margin-bottom 0.1rem
p p
...@@ -214,8 +214,8 @@ export default defineComponent({ ...@@ -214,8 +214,8 @@ export default defineComponent({
.safe-map .safe-map
display flex display flex
$card-bg2() $card-bg2()
padding .1rem padding 0.1rem
margin .1rem 0 margin 0.1rem 0
>div >div
&:first-child &:first-child
cursor pointer cursor pointer
...@@ -224,15 +224,14 @@ export default defineComponent({ ...@@ -224,15 +224,14 @@ export default defineComponent({
flex-wrap wrap flex-wrap wrap
>p >p
width 50% width 50%
padding .01rem 0 padding 0.01rem 0
span span
color #ccc color #ccc
.count .count
margin-left 0.08rem margin-left 0.08rem
font-size 0.12rem font-size 0.12rem
font-family $font-barlow font-family $font-barlow
&.show, &.show, &:hover
&:hover
span span
color #FFD400 color #FFD400
.count .count
...@@ -241,10 +240,10 @@ export default defineComponent({ ...@@ -241,10 +240,10 @@ export default defineComponent({
$center() $center()
flex 1 flex 1
>img >img
width 80% width 60%
cursor pointer cursor pointer
opacity 0.7 opacity 0.7
transition opacity .3s ease-in-out transition opacity 0.3s ease-in-out
&:hover &:hover
opacity 1 opacity 1
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment