@@ -100,13 +154,18 @@ export default {
this.getData();
},
gotopage() {
- this.$router.push("/dataBoard/satisfactionEval/dissatisfiedPersonnel?searchParams=" + this.searchParams);
+ this.$router.push(
+ "/dataBoard/satisfactionEval/dissatisfiedPersonnel?searchParams=" +
+ this.searchParams
+ );
},
getDisKey() {
- this.$http.post("/sys/dict/data/dictlist", { dictType: "satisfaction_category" }).then(({ data: { data } }) => {
- this.typeCondition = data[0].value;
- this.typeConditionList = data;
- });
+ this.$http
+ .post("/sys/dict/data/dictlist", { dictType: "satisfaction_category" })
+ .then(({ data: { data } }) => {
+ this.typeCondition = data[0].value;
+ this.typeConditionList = data;
+ });
},
getData() {
this.loading = true;
@@ -114,20 +173,26 @@ export default {
level: this.$store.state.chooseArea.chooseName.level,
orgId: this.$store.state.chooseArea.chooseName.orgId,
queryType: this.resultType,
- category: this.resultType == "provinceAndSelf" ? this.typeCondition : null,
+ category:
+ this.resultType == "provinceAndSelf" ? this.typeCondition : null,
};
- this.$http.get("/governance/satisfactionOverview/satisfactionCrowdPortrait?" + this.$paramsFormat(params)).then(({ data: { data } }) => {
- this.gender = data.gender;
- this.marriageName = data.marriageName;
- this.ageClassification = data.ageClassification;
- this.cultureName = data.cultureName;
- this.gridName = data.gridName;
- this.monthIncomeLevel = data.monthIncomeLevel;
- this.residentTagName = data.residentTagName;
- this.matchPeopleNum = data.matchPeopleNum;
- this.loading = false;
- this.searchParams = JSON.stringify({ ...data, ...params });
- });
+ this.$http
+ .get(
+ "/governance/satisfactionOverview/satisfactionCrowdPortrait?" +
+ this.$paramsFormat(params)
+ )
+ .then(({ data: { data } }) => {
+ this.gender = data.gender;
+ this.marriageName = data.marriageName;
+ this.ageClassification = data.ageClassification;
+ this.cultureName = data.cultureName;
+ this.gridName = data.gridName;
+ this.monthIncomeLevel = data.monthIncomeLevel;
+ this.residentTagName = data.residentTagName;
+ this.matchPeopleNum = data.matchPeopleNum;
+ this.loading = false;
+ this.searchParams = JSON.stringify({ ...data, ...params });
+ });
},
},
};
@@ -173,11 +238,82 @@ $purple: #6642fd;
}
}
+.portrait1 {
+ width: 500px;
+ height: 345px;
+ margin-top: -345px;
+ padding-left: 80px;
+ overflow: hidden;
+ img {
+ margin: 30px;
+ }
+ .daqipao {
+ width: 8px;
+ height: 48px;
+ }
+
+ .xiaoqipao {
+ width: 8px;
+ height: 34px;
+ }
+ .qipao1 {
+ animation: scrollmyd 5s linear infinite;
+ }
+
+ .qipao2 {
+ animation: scrollmyd1 7s linear infinite;
+ }
+
+ .qipao3 {
+ animation: scrollmyd 6s linear infinite;
+ }
+
+ .qipao4 {
+ animation: scrollmyd1 8s linear infinite;
+ }
+
+ .qipao5 {
+ animation: scrollmyd 5s linear infinite;
+ }
+
+ .qipao6 {
+ animation: scrollmyd1 7s linear infinite;
+ }
+
+ .qipao7 {
+ animation: scrollmyd 4s linear infinite;
+ }
+
+ .qipao8 {
+ animation: scrollmyd1 6s linear infinite;
+ }
+}
+
+@keyframes scrollmyd {
+ 0% {
+ transform: translatey(700%);
+ }
+
+ 100% {
+ transform: translatey(-200%);
+ }
+}
+
+@keyframes scrollmyd1 {
+ 0% {
+ transform: translatey(900%);
+ }
+
+ 100% {
+ transform: translatey(-200%);
+ }
+}
.portrait {
width: 388px;
height: 345px;
position: relative;
background: url("@/assets/images/manyidu/hx_bg.png") no-repeat center;
+ background-size: 234px 186px;
margin: 0 auto;
cursor: pointer;
diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue
index de96637eb..fa9d4c0ae 100644
--- a/src/views/dataBoardMain/main-navbar.vue
+++ b/src/views/dataBoardMain/main-navbar.vue
@@ -257,7 +257,6 @@ export default {
if (this.options.length) {
params = { orgId: this.value, level: this.getChooseLabel(this.value) };
}
- console.log(params);
this.$http
.post(`/gov/org/agency/maporg`, params)
.then(async ({ data: { data } }) => {
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index d7e4ae245..c564b76a8 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2002,7 +2002,7 @@ export default {
this.peoForm.gender = data.gender;
this.peoForm.post = data.workType;
this.peoForm.idCard = data.idCard;
- this.peoForm.duty = data.roleList.map(item=>item.roleId);
+ this.peoForm.duty = data.roleList.filter(item => item.selected).map(item => item.roleId);
// 已有的权限（职责）
let existedDutyArr = [];
data.roleList.forEach(function (sysDuty) {
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 540d4a93e..5c7f9240a 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -226,7 +226,7 @@ import {mapGetters} from "vuex";
import nextTick from "dai-js/tools/nextTick";
import fastcall from "@/views/modules/cpts/fastcall";
import * as echarts from 'echarts';
-
+import { requestPostBi } from "@/js/dai/request-bipass";
export default {
components: {fastcall},
@@ -274,7 +274,9 @@ export default {
activeName: 'resi',
- myChart: {}
+ myChart: {},
+
+ resiCategoryData:[]
}
},
computed: {
@@ -358,6 +360,35 @@ export default {
})
},
+ async getResiCategoryData() {
+ const url = "resident_class_statics";
+
+ const { data, code, msg } = await requestPostBi(
+ url,
+ {
+ queryParam: {
+ org_id: this.$store.state.user.agencyId,
+ },
+ },
+ {
+ // mockId: 60031937,
+ }
+ );
+
+ if (code === 0) {
+ this.znycCategory.list = data.map((item) => {
+ return {
+ name: item.label,
+ count: item.count,
+ per: item.ratio,
+ const: "const",
+ };
+ });
+ console.log(this.resiCategoryData);
+ } else {
+ this.$message.error(msg);
+ }
+ },
handleWindowResize() {
if (this.myChart) {
this.myChart.resize();
@@ -424,7 +455,8 @@ export default {
async getApiData() {
await this.getOrgData();
this.getWarningList();
- this.getZnycList();
+ // this.getZnycList();
+ this.getResiCategoryData()
this.getPandectData();
this.getNoticeData();
},
+ 
+ 