Browse Source

问题修改

feature
张若晨 2 years ago
parent
commit
47c9666f43
  1. 2
      src/views/dataBoard/overview/components/DynamicHumanRoomData.vue
  2. 10
      src/views/dataBoard/overview/components/GridUpdateRanking.vue
  3. 10
      src/views/dataBoard/overview/components/RankingGridData.vue
  4. 160
      src/views/dataBoard/overview/components/jdwgy.vue
  5. 12
      src/views/dataBoard/overview/components/sq12345.vue
  6. 12
      src/views/dataBoard/overview/components/sqrfph.vue

2
src/views/dataBoard/overview/components/DynamicHumanRoomData.vue

@ -88,7 +88,7 @@ export default {
const aniHeight =
this.$refs.animation2.querySelector(".tr").offsetHeight *
this.pmList.length;
this.$refs.animation2.style.animation = "move2 10s linear infinite";
this.$refs.animation2.style.animation = `move1 ${this.pmList.length}s linear infinite`;
document.styleSheets[0].insertRule(
`@keyframes move2{0% {transform: translateY(0px);}100% {transform: translateY(-${aniHeight}px);}`,
0

10
src/views/dataBoard/overview/components/GridUpdateRanking.vue

@ -99,8 +99,7 @@ export default {
const aniHeight =
this.$refs.animation1.querySelector(".tr").offsetHeight *
this.pmList.length;
this.$refs.animation1.style.animation =
"move1 10s linear infinite";
this.$refs.animation1.style.animation = `move1 ${this.pmList.length}s linear infinite`;
document.styleSheets[0].insertRule(
`@keyframes move1{0% {transform: translateY(0px);}100% {transform: translateY(-${aniHeight}px);}`,
0
@ -121,4 +120,11 @@ export default {
padding-top: 0 !important;
height: 150px !important;
}
.zanwuText {
margin-top: -34px;
font-size: 14px;
font-family: PingFang SC;
font-weight: 500;
color: #a3b9da;
}
</style>

10
src/views/dataBoard/overview/components/RankingGridData.vue

@ -120,8 +120,7 @@ export default {
const aniHeight =
this.$refs.animation3.querySelector(".tr").offsetHeight *
this.pmList.length;
this.$refs.animation3.style.animation =
"move3 10s linear infinite";
this.$refs.animation3.style.animation = `move3 ${this.pmList.length}s linear infinite`;
document.styleSheets[0].insertRule(
`@keyframes move3{0% {transform: translateY(0px);}100% {transform: translateY(-${aniHeight}px);}`,
0
@ -162,4 +161,11 @@ export default {
}
}
}
.zanwuText {
margin-top: -34px;
font-size: 14px;
font-family: PingFang SC;
font-weight: 500;
color: #a3b9da;
}
</style>

160
src/views/dataBoard/overview/components/jdwgy.vue

@ -1,7 +1,16 @@
<template>
<div class="m-subbox m-jdwgy">
<div class="table">
<el-table :data="list" v-if="currentLevelData.orgLevel != 'grid' && peopleType != 'staffDepartment'" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.3)" max-height="190px" height="190px">
<el-table
:data="list"
v-if="
currentLevelData.orgLevel != 'grid' && peopleType != 'staffDepartment'
"
v-loading="loading"
element-loading-background="rgba(0, 0, 0, 0.3)"
max-height="190px"
height="190px"
>
<el-table-column label="序号" type="index" width="80" />
<el-table-column prop="orgName" width="120" label="组织名称" />
<el-table-column prop="name" width="120" label="姓名" />
@ -18,26 +27,82 @@
</el-table-column>
<el-table-column prop="operate" width="80" label="操作">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"> 查看</el-button>
<el-button @click="handleClick(scope.row)" type="text" size="small">
查看</el-button
>
</template>
</el-table-column>
<template slot="empty">
<div
style="
width: 100%;
height: 100%;
text-align: center;
padding-top: 50px;
color: #ffffff;
"
>
<img
width="268px"
height="128px"
src="~@/assets/images/overview/zanwu.png"
/>
<div class="zanwuText">暂无数据</div>
</div>
</template>
</el-table>
<!-- 单位/组织 -->
<el-table :data="unitList" v-if="currentLevelData.orgLevel != 'grid' && peopleType === 'staffDepartment'" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.3)" max-height="190px" height="190px">
<el-table
:data="unitList"
v-if="
currentLevelData.orgLevel != 'grid' &&
peopleType === 'staffDepartment'
"
v-loading="loading"
element-loading-background="rgba(0, 0, 0, 0.3)"
max-height="190px"
height="190px"
>
<el-table-column label="序号" type="index" width="80" />
<el-table-column prop="departmentName" label="单位名称" />
<el-table-column prop="departmentDuty" label="职责" />
<el-table-column prop="deptType" label="单位类型" />
<el-table-column prop="totalUser" label="总人数" />
<template slot="empty">
<div
style="
width: 100%;
height: 100%;
text-align: center;
padding-top: 50px;
color: #ffffff;
"
>
<img
width="268px"
height="128px"
src="~@/assets/images/overview/zanwu.png"
/>
<div class="zanwuText">暂无数据</div>
</div>
</template>
</el-table>
<el-table v-if="currentLevelData.orgLevel == 'grid'" :data="wglist" v-loading="loading" max-height="190px" height="190px">
<el-table
v-if="currentLevelData.orgLevel == 'grid'"
:data="wglist"
v-loading="loading"
max-height="190px"
height="190px"
>
<el-table-column label="序号" type="index" width="50" />
<el-table-column prop="name" width="140" label="组织名称" />
<el-table-column prop="type" width="90" label="类型">
<template slot-scope="scope">
<span :style="'color:' + scope.row.type">{{ types[scope.row.type] }}</span>
<span :style="'color:' + scope.row.type">{{
types[scope.row.type]
}}</span>
</template>
</el-table-column>
<el-table-column prop="houseNum" width="90" label="户数" />
@ -47,9 +112,29 @@
<el-table-column prop="safetyNum" label="安全隐患" />
<el-table-column prop="operate" width="80" label="操作">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small"> 查看</el-button>
<el-button @click="handleClick(scope.row)" type="text" size="small">
查看</el-button
>
</template>
</el-table-column>
<template slot="empty">
<div
style="
width: 100%;
height: 100%;
text-align: center;
padding-top: 50px;
color: #ffffff;
"
>
<img
width="268px"
height="128px"
src="~@/assets/images/overview/zanwu.png"
/>
<div class="zanwuText">暂无数据</div>
</div>
</template>
</el-table>
</div>
</div>
@ -109,21 +194,41 @@ export default {
this.loading = true;
if (this.currentLevelData.orgLevel == "grid") {
const personType = this.ifUnit ? "unit" : this.peopleType;
this.$http.get("/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" + personType + "&level=" + this.currentLevelData.orgLevel + "&orgId=" + this.currentLevelData.orgId).then(({ data: { data } }) => {
this.loading = false;
this.wglist = data;
this.$emit(
"setPoint",
data.filter((item) => item.longitude && item.latitude)
);
});
this.$http
.get(
"/actual/base/streetOverview/queryPersonnelGridGroup?personnelType=" +
personType +
"&level=" +
this.currentLevelData.orgLevel +
"&orgId=" +
this.currentLevelData.orgId
)
.then(({ data: { data } }) => {
this.loading = false;
this.wglist = data;
this.$emit(
"setPoint",
data.filter((item) => item.longitude && item.latitude)
);
});
} else {
this.$http.get("/actual/base/streetOverview/queryPersonnelGroup?level=" + this.currentLevelData.orgLevel + "&orgId=" + this.currentLevelData.orgId + "&personnelType=" + this.peopleType).then(({ data: { data } }) => {
this.loading = false;
this.list = data.personnelInfoVOList;
this.unitList = data.departmentInfoVOList ? data.departmentInfoVOList : [];
this.$emit("setNum", data.orgPersonnelVOList);
});
this.$http
.get(
"/actual/base/streetOverview/queryPersonnelGroup?level=" +
this.currentLevelData.orgLevel +
"&orgId=" +
this.currentLevelData.orgId +
"&personnelType=" +
this.peopleType
)
.then(({ data: { data } }) => {
this.loading = false;
this.list = data.personnelInfoVOList;
this.unitList = data.departmentInfoVOList
? data.departmentInfoVOList
: [];
this.$emit("setNum", data.orgPersonnelVOList);
});
}
},
handleClick(item) {
@ -150,7 +255,11 @@ export default {
},
};
</script>
<style lang="scss" src="@/assets/scss/dataBoard/overview/index.scss" scoped></style>
<style
lang="scss"
src="@/assets/scss/dataBoard/overview/index.scss"
scoped
></style>
<style lang="scss" src="@/assets/scss/dataBoard/table.scss" scoped></style>
<style lang="scss" scoped>
/deep/ .table {
@ -158,7 +267,7 @@ export default {
&:before {
display: none !important;
}
td {
padding: 3px 14px !important;
}
@ -168,4 +277,11 @@ export default {
// }
}
}
.zanwuText {
margin-top: -54px;
font-size: 14px;
font-family: PingFang SC;
font-weight: 500;
color: #a3b9da;
}
</style>

12
src/views/dataBoard/overview/components/sq12345.vue

@ -108,8 +108,7 @@ export default {
this.$refs.animation4.querySelector(".tr").offsetHeight *
this.pmList.length;
console.log(aniHeight);
this.$refs.animation4.style.animation =
"move4 10s linear infinite";
this.$refs.animation4.style.animation = `move4 ${this.pmList.length}s linear infinite`;
document.styleSheets[0].insertRule(
`@keyframes move4{0% {transform: translateY(0px);}100% {transform: translateY(-${aniHeight}px);}`,
0
@ -129,3 +128,12 @@ export default {
src="@/assets/scss/dataBoard/overview/index.scss"
scoped
></style>
<style lang="scss" scoped>
.zanwuText {
margin-top: -34px;
font-size: 14px;
font-family: PingFang SC;
font-weight: 500;
color: #a3b9da;
}
</style>

12
src/views/dataBoard/overview/components/sqrfph.vue

@ -107,7 +107,7 @@ export default {
const aniHeight =
this.$refs.animation5.querySelector(".tr").offsetHeight *
this.pmList.length;
this.$refs.animation5.style.animation = "move5 10s linear infinite";
this.$refs.animation5.style.animation = `move5 ${this.pmList.length}s linear infinite`;
document.styleSheets[0].insertRule(
`@keyframes move5{0% {transform: translateY(0px);}100% {transform: translateY(-${aniHeight}px);}`,
0
@ -127,3 +127,13 @@ export default {
src="@/assets/scss/dataBoard/overview/index.scss"
scoped
></style>
<style lang="scss" scoped>
.zanwuText {
margin-top: -34px;
font-size: 14px;
font-family: PingFang SC;
font-weight: 500;
color: #a3b9da;
}
</style>
Loading…
Cancel
Save