diff --git a/src/assets/images/overview/down-icon.png b/src/assets/images/overview/down-icon.png new file mode 100644 index 000000000..d8ae1170e Binary files /dev/null and b/src/assets/images/overview/down-icon.png differ diff --git a/src/assets/images/overview/qipao-xiao.png b/src/assets/images/overview/qipao-xiao.png new file mode 100644 index 000000000..408c9e08b Binary files /dev/null and b/src/assets/images/overview/qipao-xiao.png differ diff --git a/src/assets/images/overview/qipao.png b/src/assets/images/overview/qipao.png new file mode 100644 index 000000000..99740f0d2 Binary files /dev/null and b/src/assets/images/overview/qipao.png differ diff --git a/src/assets/images/overview/up-icon.png b/src/assets/images/overview/up-icon.png new file mode 100644 index 000000000..2ec174b2e Binary files /dev/null and b/src/assets/images/overview/up-icon.png differ diff --git a/src/assets/images/shuju/overview/jiedao-img.png b/src/assets/images/shuju/overview/jiedao-img.png index 7cee2d28f..8e8b8c349 100644 Binary files a/src/assets/images/shuju/overview/jiedao-img.png and b/src/assets/images/shuju/overview/jiedao-img.png differ diff --git a/src/assets/scss/dataBoard/overview/index.scss b/src/assets/scss/dataBoard/overview/index.scss index c4537482c..3f391f481 100644 --- a/src/assets/scss/dataBoard/overview/index.scss +++ b/src/assets/scss/dataBoard/overview/index.scss @@ -16,6 +16,18 @@ width: 884px; } + .g-center-open { + position: relative; + width: 884px; + + .m-map { + position: relative; + width: 100%; + height: 905px; + margin-bottom: 10px; + } + } + .g-right { width: 460px; } @@ -48,15 +60,6 @@ animation: move 10s linear infinite; } -@keyframes move { - 0% { - transform: translateY(0px); - } - - 100% { - transform: translateY(-320px); - } -} .m-jdjs { height: 318px; @@ -133,6 +136,16 @@ } } +@keyframes move { + from { + margin-top: -232px; + } + + to { + margin-top: -0; + } +} + @mixin rounded-corners { width: 76px; height: 76px; @@ -232,6 +245,9 @@ &-center { margin-top: 6px; + height: 232px; + + &-xiaoqipao {} &-line {} @@ -270,8 +286,79 @@ } } } + + &-center-two { + height: 232px; + margin-top: -232px; + width: 100%; + overflow: hidden; + + img { + margin-left: 40px; + } + + .daqipao { + width: 8px; + height: 48px + } + + .xiaoqipao { + width: 8px; + height: 34px + } + } + + &-center-two .qipao1 { + animation: scroll 5s linear infinite; + } + + &-center-two .qipao2 { + animation: scroll1 7s linear infinite; + } + + &-center-two .qipao3 { + animation: scroll 6s linear infinite; + } + + &-center-two .qipao4 { + animation: scroll1 8s linear infinite; + } + + &-center-two .qipao5 { + animation: scroll 5s linear infinite; + } + + &-center-two .qipao6 { + animation: scroll1 7s linear infinite; + } + + &-center-two .qipao7 { + animation: scroll 4s linear infinite; + } + + &-center-two .qipao8 { + animation: scroll1 6s linear infinite; + } } +@keyframes scroll { + 0% { + transform: translatey(500%); + } + + 100% { + transform: translatey(-200%); + } +} +@keyframes scroll1 { + 0% { + transform: translatey(700%); + } + + 100% { + transform: translatey(-200%); + } +} .m-jdwgy { height: 220px; @@ -674,4 +761,39 @@ width: 90px; border: 0; } +} + +::v-deep .date-current-weiyi { + background: rgba(3, 19, 51, 0.9); + border-color: #006cff; + box-shadow: inset 0px 0px 16px 0px rgba(0, 145, 255, 1); + + .el-date-picker__header-label { + color: #a0cdff; + } + + .el-picker-panel__icon-btn { + color: #a0cdff; + } + + .el-month-table { + td { + .cell { + color: #a0cdff; + } + } + } + + .el-month-table td.current:not(.disabled) .cell { + color: #fff; + background-color: #409eff; + } + + .el-month-table td.today:not(.disabled) .cell { + color: #0056d6; + } + + .el-date-picker__header--bordered { + border-bottom: solid 1px #006cff; + } } \ No newline at end of file diff --git a/src/views/dataBoard/cpts/details/jmxq.vue b/src/views/dataBoard/cpts/details/jmxq.vue index ad679d208..01826b762 100644 --- a/src/views/dataBoard/cpts/details/jmxq.vue +++ b/src/views/dataBoard/cpts/details/jmxq.vue @@ -42,9 +42,7 @@
上报时间: - {{ - item.reportTime - }} + {{ item.reportTime }}
需求描述:
@@ -56,7 +54,7 @@
需求人电话: - {{ item.demandUserMobile }} + {{ $sensitive(item.demandUserMobile, 3, 7) }}
完成时限: @@ -259,7 +257,7 @@ export default { getDetailsData(id) { this.loading = true; - + let params = { demandRecId: id, }; diff --git a/src/views/dataBoard/cpts/details/smyd.vue b/src/views/dataBoard/cpts/details/smyd.vue index c72b67410..b8c99204c 100644 --- a/src/views/dataBoard/cpts/details/smyd.vue +++ b/src/views/dataBoard/cpts/details/smyd.vue @@ -56,7 +56,7 @@
提交人电话: - {{ item.mobile }} + {{ $sensitive(item.mobile, 3, 7) }}
完成时限: diff --git a/src/views/dataBoard/cpts/details/xqwmz.vue b/src/views/dataBoard/cpts/details/xqwmz.vue index 9bf9bce5a..9d56352aa 100644 --- a/src/views/dataBoard/cpts/details/xqwmz.vue +++ b/src/views/dataBoard/cpts/details/xqwmz.vue @@ -56,7 +56,7 @@
提交人电话: - {{ item.reporterMobile }} + {{ $sensitive(item.reporterMobile, 3, 7) }}
完成时限: diff --git a/src/views/dataBoard/cpts/details/yxwxfw.vue b/src/views/dataBoard/cpts/details/yxwxfw.vue index ab6d59f7d..d457287e9 100644 --- a/src/views/dataBoard/cpts/details/yxwxfw.vue +++ b/src/views/dataBoard/cpts/details/yxwxfw.vue @@ -59,7 +59,7 @@
联系电话: - {{ formData.principalContact }} + {{ $sensitive(formData.principalContact, 3, 7) }}
服务方: @@ -235,6 +235,16 @@ export default { this.$message.error(msg); } }); + this.$http + .post("/governance/icEvent/process", { icEventId: id }) + .then((res) => { + const { code, data, msg } = res.data; + if (code === 0) { + this.activities = data; + } else { + this.$message.error(msg); + } + }); }, }, }; diff --git a/src/views/dataBoard/cpts/family/modules/businessTables copy/economize.vue b/src/views/dataBoard/cpts/family/modules/businessTables copy/economize.vue new file mode 100644 index 000000000..c52a55d1d --- /dev/null +++ b/src/views/dataBoard/cpts/family/modules/businessTables copy/economize.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/dataBoard/cpts/personnel/index.vue b/src/views/dataBoard/cpts/personnel/index.vue index c56dc607c..de179eeba 100644 --- a/src/views/dataBoard/cpts/personnel/index.vue +++ b/src/views/dataBoard/cpts/personnel/index.vue @@ -4,7 +4,7 @@
- 更多> + 详情>
diff --git a/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue b/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue index 10ef93f55..dccf99e9e 100644 --- a/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue +++ b/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue @@ -12,9 +12,11 @@
{{ data.gridName }}
- {{ data.idNum }} + {{ $sensitive(data.idNum, 6, 16) }} +
+
+ {{ $sensitive(data.mobile, 3, 7) }}
-
{{ data.mobile }}
{{ data.householdSituation }}
@@ -129,7 +131,7 @@ export default { } .user-name { - width:174px; + width: 174px; text-align: center; height: 17px; font-size: 18px; diff --git a/src/views/dataBoard/overview/components/jdtphx.vue b/src/views/dataBoard/overview/components/jdtphx.vue index 34305f076..12bbb0b91 100644 --- a/src/views/dataBoard/overview/components/jdtphx.vue +++ b/src/views/dataBoard/overview/components/jdtphx.vue @@ -43,7 +43,6 @@
-
@@ -74,7 +73,16 @@
-
+
+
+ + + + + + + +
diff --git a/src/views/dataBoard/overview/components/jdwgy.vue b/src/views/dataBoard/overview/components/jdwgy.vue index 9651c3fdf..5d149211a 100644 --- a/src/views/dataBoard/overview/components/jdwgy.vue +++ b/src/views/dataBoard/overview/components/jdwgy.vue @@ -24,7 +24,7 @@ - + @@ -193,8 +262,8 @@ import RankingGridData from "@/views/dataBoard/overview/components/RankingGridDa import FollowUp from "@/views/dataBoard/overview/components/FollowUp.vue"; import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue"; -import {requestPostBi} from "@/js/dai/request-bipass"; -import {requestPost} from "@/js/dai/request"; +import { requestPostBi } from "@/js/dai/request-bipass"; +import { requestPost } from "@/js/dai/request"; export default { name: "renfang", @@ -237,7 +306,7 @@ export default { currentLevelData: { orgId: this.$store.state.chooseArea.chooseName.orgId, orgLevel: this.$store.state.chooseArea.chooseName.level, - meta: {title: "人房总览"}, + meta: { title: "人房总览" }, }, breadList: [ { @@ -245,7 +314,7 @@ export default { orgLevel: "", id: "", level: "", - meta: {title: "人房总览"}, + meta: { title: "人房总览" }, }, ], peopleList: { @@ -284,6 +353,7 @@ export default { ], customerName: "", peopleType: "staffAgency", + listShow: true, }; }, @@ -313,7 +383,7 @@ export default { methods: { changeCustomerName() { this.customerName = - localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; + localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; }, changeType(e) { this.peopleType = e; @@ -351,12 +421,12 @@ export default { } }, - clickBreadItem({item}) { + clickBreadItem({ item }) { this.toBread(item); }, clickAgencyItem(item) { - this.$refs.map.clearMarkert() + this.$refs.map.clearMarkert(); if (item.id) { this.customerName = item.name || item.meta.title; this.currentLevelData = { @@ -365,7 +435,7 @@ export default { }; } else { this.customerName = - localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; + localStorage.getItem("customerNameDataBoard") || "数据分析可视化平台"; this.currentLevelData = { ...this.$store.state.chooseArea.chooseName, orgLevel: this.$store.state.chooseArea.chooseName.level, @@ -374,7 +444,7 @@ export default { this.toBread({ orgId: item.id, orgLevel: item.level, - meta: {title: item.name}, + meta: { title: item.name }, }); }, goBackMap() { @@ -382,13 +452,13 @@ export default { this.clickAgencyItem(item); }, toBread(item) { - const {orgId} = item; - const {breadList} = this; + const { orgId } = item; + const { breadList } = this; let index = breadList.findIndex((val) => val.orgId === orgId); if (index >= 0) { this.breadList = breadList.slice(0, index + 1); } else { - breadList.push({...item, id: item.orgId, level: item.orgLevel}); + breadList.push({ ...item, id: item.orgId, level: item.orgLevel }); this.breadList = breadList; } this.getMapData(item.orgId, item.orgLevel); @@ -399,72 +469,81 @@ export default { if (!item.longitude) { return this.$message.error("请先设置坐标"); } - this.$refs.map.setDotMarker(item, [parseFloat(item.longitude), parseFloat(item.latitude)]); + this.$refs.map.setDotMarker(item, [ + parseFloat(item.longitude), + parseFloat(item.latitude), + ]); }, setNum(data) { - console.log(this.orgData,data,'111') + console.log(this.orgData, data, "111"); // data - let params = [] - let org = this.orgData.children - org.forEach(item => { - data.forEach(item2 => { + let params = []; + let org = this.orgData.children; + org.forEach((item) => { + data.forEach((item2) => { if (item2.orgId === item.id && item.coordinates) { params.push({ ...item2, peopleType: this.peopleList[this.peopleType], latitude: item.latitude, - longitude: item.longitude - }) + longitude: item.longitude, + }); } - }) - }) + }); + }); if (params.length) { - this.$refs.map.setNum(params) + this.$refs.map.setNum(params); } }, + upDownShow() { + this.listShow = !this.listShow; + }, setPoint(data) { if (data) { - this.$refs.map.setPoint(data) + this.$refs.map.setPoint(data); } }, //获取地图上显示的组织数据 async getMapData( - orgId = this.$store.state.chooseArea.chooseName.orgId, - level = this.$store.state.chooseArea.chooseName.level + orgId = this.$store.state.chooseArea.chooseName.orgId, + level = this.$store.state.chooseArea.chooseName.level ) { const url = "org_map"; - this.$http.post(`/gov/org/agency/maporg`, {orgId, level}).then(({data: {data}}) => { - this.orgData = data; - this.orgId = this.orgData.id; - console.log(this.orgId) - this.orgLevel = this.orgData.level; - this.currentLevel = this.orgData.agencyLevel; - this.currentLevelData = { - orgId: this.orgId, - orgLevel: this.currentLevel, - }; - this.peopleType = this.currentLevel === 'grid'?'unit':'staffAgency'; - }); + this.$http + .post(`/gov/org/agency/maporg`, { orgId, level }) + .then(({ data: { data } }) => { + this.orgData = data; + this.orgId = this.orgData.id; + console.log(this.orgId); + this.orgLevel = this.orgData.level; + this.currentLevel = this.orgData.agencyLevel; + this.currentLevelData = { + orgId: this.orgId, + orgLevel: this.currentLevel, + }; + this.peopleType = + this.currentLevel === "grid" ? "unit" : "staffAgency"; + }); }, //获取地图上显示的组织数据 async getSubMapData() { const url = "sub_org_map"; - const {data, code, msg} = await requestPostBi( - url, - { - queryParam: { - org_id: this.orgId, - }, + const { data, code, msg } = await requestPostBi( + url, + { + queryParam: { + org_id: this.orgId, }, - { - // mockId: 61831860, - } + }, + { + // mockId: 61831860, + } ); if (code === 0) { - const {orgData} = this; + const { orgData } = this; orgData.children = data.map((item) => { return { ...item, @@ -475,7 +554,7 @@ export default { coordinates: item.coordinates || "", }; }); - this.orgData = {...orgData}; + this.orgData = { ...orgData }; } else { this.$message.error(msg); } @@ -489,7 +568,7 @@ export default { level: this.orgLevel, }; - const {data, code, msg} = await requestPost(url, params); + const { data, code, msg } = await requestPost(url, params); if (code === 0) { this.orgData = data; this.orgId = this.orgId; @@ -505,6 +584,16 @@ export default { }; - +