From e34baeb6d2aea019ae5d82ff95d8cae25bd87a60 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 16 Jun 2022 17:44:58 +0800 Subject: [PATCH 01/68] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E4=BA=94?= =?UTF-8?q?=E5=A4=A7=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/shuju/weixuan.png | Bin 0 -> 356 bytes src/assets/img/shuju/xuanzhong.png | Bin 0 -> 278 bytes .../scss/modules/visual/fiveLayerMap.scss | 621 +++++++++++ .../ninePlaces/inspect/inspect.vue | 2 +- .../ninePlaces/places/places.vue | 2 +- .../communityService/ninePlaces/team/team.vue | 2 +- src/views/modules/shequzhili/csgltc/csgl.vue | 548 ++++++++++ .../modules/shequzhili/csgltc/csglDetail.vue | 281 +++++ .../modules/shequzhili/csgltc/csglForm.vue | 495 +++++++++ src/views/modules/shequzhili/ggfwtc/ggfw.vue | 705 +++++++++++++ .../modules/shequzhili/ggfwtc/ggfwDetail.vue | 281 +++++ .../modules/shequzhili/ggfwtc/ggfwForm.vue | 527 ++++++++++ .../communityGovern/fivelayers/mapIndex.vue | 973 ++++++++++++++++++ 13 files changed, 4434 insertions(+), 3 deletions(-) create mode 100644 src/assets/img/shuju/weixuan.png create mode 100644 src/assets/img/shuju/xuanzhong.png create mode 100644 src/assets/scss/modules/visual/fiveLayerMap.scss create mode 100644 src/views/modules/shequzhili/csgltc/csgl.vue create mode 100644 src/views/modules/shequzhili/csgltc/csglDetail.vue create mode 100644 src/views/modules/shequzhili/csgltc/csglForm.vue create mode 100644 src/views/modules/shequzhili/ggfwtc/ggfw.vue create mode 100644 src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue create mode 100644 src/views/modules/shequzhili/ggfwtc/ggfwForm.vue create mode 100644 src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue diff --git a/src/assets/img/shuju/weixuan.png b/src/assets/img/shuju/weixuan.png new file mode 100644 index 0000000000000000000000000000000000000000..90ab7f0d5f81fd277200151d67509dee997290e2 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC7>k44ofy`glX(f`)CKs2xB_Vg z-!lw;8yQ?TvU_c1aM{8WdV?D)hMkcq- zOs-p4TsN_}Z((uUA`o_h*?lv!+ZJXwAh{L91|gsnkPBk)ha3eWzF-i^AAA(3k}voO ztLHYppd-(^-#i66K&vFkFPMRgS4vG&%hcJ`FCro~K0dRwytSvVfA-?l>o@N|eDUGq zH}5`t{QCXZ-+wc*y_A5u;yhg(LpWro9&F`pa1dZQ;3{u_=kCk>j+1g544U_!dLA+T z@2#8*##>#(c$YWynSGpNAkVr*Y+mMy9l{qTS+?c5_BMRe3Yj+h8`G{fo4!j`Vi(H# jVlSUBXV}zQ!z&-RoQZ7-|C$qbKq2Jm>gTe~DWM4feQkxq literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/xuanzhong.png b/src/assets/img/shuju/xuanzhong.png new file mode 100644 index 0000000000000000000000000000000000000000..698dbc50ca4d3f10a678a2b9f7752ebea8b4c5d5 GIT binary patch literal 278 zcmV+x0qOpUP)Px#&`Cr=R47wzk3CKTQ4~hcy#vDxFh&xHi6RTY2C%}G1+WGRS~g)qWoP3KNVKt` zvLGR0LgxwyKNY1m4lwW@0j9M2nv*Z*Ncr7N_~l8`ATCHISywO)p_Jc@wM&a+K?6a9 z(}L!Ng9rZtjS9Rpp*2l_M{Bt*2%|OJ-N0uXp1&i8f8OPx8pRB{Y5E~_>hQIUc%6eS z_!q#;w$$!747yj0S24YCi img { + width: 24px; + height: 24px; + } + } + + > span { + line-height: 56px; + margin-left: 10px; + } + } + + .btn { + text-align: center; + flex: 0 0 113px; + height: 56px; + background: linear-gradient(90deg, #1a5afd, #26c4ff); + font-size: 20px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 56px; + border-radius: 0 4px 4px 0; + } + } + + .div_search:hover { + cursor: pointer; + } + + .div_tips{ + box-sizing: border-box; + width: 100%; + height: 302px; + color: #fff; + background: url('../../../img/modules/visual/warning-box.png') no-repeat + center; + background-size: 100% 100%; + + .div_coverage{ + padding: 30px 20px 30px 20px; + display: flex; + justify-content: space-around; + + .coverage_item{ + // padding-right:11px; + + >img{ + width:16px; + height:16px; + } + + >span{ + margin-left:6px; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #FFFFFF; + } + } + + .coverage_item:hover{ + cursor: pointer; + } + } + } + + .div_info { + box-sizing: border-box; + width: 100%; + + height: calc(88vh - 302px - 10px); + color: #fff; + background: url('../../../img/modules/visual/warning-box.png') no-repeat + center; + background-size: 100% 100%; + // padding: 45px 21px 35px 24px; + + .info_loading { + margin-top: 50px; + } + .info_tip { + padding: 31px 0 0 19px; + display: flex; + > img { + height: 34px; + width: 46px; + } + + .tip_title { + line-height: 34px; + margin-left: 7px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + } + } + + .info_list { + margin-top: 9px; + + .item { + .item_line { + margin-top: 13px; + margin-left: 24px; + width: 517px; + height: 0px; + border: 1px dotted #1797ff31; + border-width: 0.5px; + } + .last_line { + border: 1px dotted #1797ff00; + } + .list_item { + display: flex; + padding: 18px 59px 0; + justify-content: space-between; + + .list_item_col { + flex: 0 0 240px; + display: flex; + + > img { + height: 76px; + width: 76px; + } + + .item_content { + margin-left: 10px; + height: 76px; + display: flex; + flex-direction: column; + justify-content: center; + + .item_label { + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + } + .item_count { + margin-top: 10px; + font-size: 28px; + font-family: PingFang SC; + font-weight: bold; + color: #00fffc; + } + } + } + } + + ::v-deep .el-popper { + padding: 0px; + } + // + } + } + } + + .div_tips { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; + } + } + } +} + +.div_community_info { + box-sizing: border-box; + flex: 0 0 calc(100vw - 620px); + // width: calc(100vw - 560px); + + height: calc(88vh - 10px); + color: #fff; + background: url('../../../img/modules/visual/warning-box.png') no-repeat + center; + background-size: 100% 100%; + + .div_select { + margin-top: 28px; + margin-left: 24px; + display: flex; + .customer_select { + display: flex; + justify-content: flex-start; + + > span { + width: auto; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + line-height: 34px; + } + } + > img { + height: 34px; + width: 46px; + } + + .tip_title { + line-height: 34px; + margin-left: 12px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + } + } + + .div_room_bar { + box-sizing: border-box; + + margin-top: 9px; + height: calc(88vh - 120px); + } + + .div_room { + // height: calc(88vh - 40px); + // margin-top: 9px; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + margin: 0 21px 0 21px; + + .item:hover { + cursor: pointer; + } + .item_sel { + box-shadow: 0 0 10px inset #1a5afd; + } + .item { + background-color: #011168; + margin-top: 12px; + width: 244px; + height: 190px; + border: 1px solid #037ddc; + border-radius: 8px; + text-align: center; + margin-left: 11px; + position: relative; + + // &:first-child { + // margin-left: 0; + // } + + .housename { + margin-top: 70px; + font-size: 24px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + // line-height: 180px; + } + + .icon_party { + position: absolute; + top: 10px; + left: 12px; + } + .icon_roomstate { + position: absolute; + top: 16px; + right: 16px; + font-size: 14px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + } + + .icon_category { + position: absolute; + bottom: 14px; + left: 9px; + display: flex; + justify-content: flex-start; + // margin-left: 7px; + + .div_icon_item{ + .icon_img{ + margin-left: 5px; + width: 21px; + height: 20px; + } + .icon_name{ + text-align: center; + display: flex; + justify-content: center; + } + } + + } + .div_user:hover { + cursor: pointer; + } + + .div_user { + position: absolute; + bottom: 10px; + right: 11px; + width: 88px; + height: 30px; + background: #073082; + border-radius: 15px; + + > img { + width: 10px; + height: 6px; + margin-left: 4px; + } + + > span { + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 30px; + } + } + } + } + + .div_room::after { + content: ''; + flex: 1; + } +} + +.user_list { + position: relative; + z-index: 10; + + background: #020340; + border: 1px solid #0a359b; + border-radius: 4px; + box-shadow: 0 0 10px inset #1a5afd; + + .user_item { + padding: 9px 8px 0 12px; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 10px; + + .user_item_content { + display: flex; + // justify-content: space-between; + align-items: center; + + .name { + max-width: 80%; + text-align: left; + } + + > img { + margin-left: auto; + + margin-top: 4px; + width: 8px; + height: 12px; + } + } + + .item_line { + margin-top: 9px; + width: 70px; + height: 0px; + border: 1px dotted #1797ff31; + border-width: 0.5px; + } + .last_line { + border: 1px dotted #1797ff00; + } + } +} + +.m-sidebar { + position: absolute; + right: 0; + top: 50px; + z-index: 1000; + width: 370px; + height: 470px; + overflow: hidden; + + .wrap { + display: flex; + justify-content: flex-start; + align-items: center; + background-color: rgba(rgb(173, 173, 173), 0); + transform: translateX(-5px); + transition: all ease 1s; + border-radius: 4px; + } + + .wrap-hidden { + transform: translateX(339px); + } + + .div_agency_list { + width: 320px; + height: 470px; + color: #fff; + background: url('../../../img/modules/visual/box-2.png') no-repeat center; + background-size: 100% 100%; + padding: 45px 20px 35px 20px; + + .agency_main { + height: 100%; + position: relative; + } + + .agency_main { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; + } + } + + .no-data-img { + text-align: center; + margin-top: 50px; + margin-left: 15px; + } + .agency_list { + .agency_item { + // height: 60px; + padding: 15px 0; + font-size: 17px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + // line-height: 50px; + padding-left: 12px; + display: flex; + flex-direction: row; + align-items: center; + // padding-top: 15px; + + .agency_item_name { + // line-height: 20px; + } + } + + .agency_item_on { + background: #08216c; + border-radius: 2px; + } + + .agency_item:hover { + cursor: pointer; + background-color: #011168; + border-radius: 4px 0 0 4px; + border: none; + box-shadow: 0 0 10px inset #1a5afd; + border-radius: 2px; + } + } + } + + .arrow_tip { + margin-right: -2px; + margin-left: 10px; + > img { + width: 22px; + height: 176px; + } + } + .arrow_tip:hover { + cursor: pointer; + } +} + +.m-room-pop { + @include shield; + background-color: rgba(#000, 0.9); + overflow-y: auto; + + .wrap { + position: relative; + margin: 120px auto; + width: 680px; + + .title { + padding: 10px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + } + + .btn-close { + position: absolute; + top: -15px; + right: -15px; + cursor: pointer; + } + + .list { + // display: flex; + // flex-wrap: wrap; + padding: 5px 60px 5px 30px; + + .item { + position: relative; + box-sizing: border-box; + padding: 0 15px; + width: 100%; + color: #fff; + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + line-height: 24px; + margin: 15px 0; + + &::before { + position: absolute; + left: 0; + top: 9px; + content: ""; + display: block; + width: 7px; + height: 7px; + background: #0c81fe; + border-radius: 3px; + } + } + } + + + } +} diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue index a5b14d62..928a3455 100644 --- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue +++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue @@ -277,7 +277,7 @@ export default { return { loading: false, total: 0, - pageSize: 10, + pageSize: 20, pageNo: 0, tableLoading: false, diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue index 0e356e9a..f7ef29db 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -209,7 +209,7 @@ export default { return { loading: false, total: 0, - pageSize: 10, + pageSize: 20, pageNo: 0, tableLoading: false, diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue index 1b05e70d..ea2ce120 100644 --- a/src/views/modules/communityService/ninePlaces/team/team.vue +++ b/src/views/modules/communityService/ninePlaces/team/team.vue @@ -202,7 +202,7 @@ export default { return { loading: false, total: 0, - pageSize: 10, + pageSize: 20, pageNo: 0, tableLoading: false, diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue new file mode 100644 index 00000000..f42dfbb0 --- /dev/null +++ b/src/views/modules/shequzhili/csgltc/csgl.vue @@ -0,0 +1,548 @@ + + + + diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue new file mode 100644 index 00000000..306fc3f8 --- /dev/null +++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue @@ -0,0 +1,281 @@ + + + + + + + diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue new file mode 100644 index 00000000..f12353d1 --- /dev/null +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -0,0 +1,495 @@ + + + + + + diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue new file mode 100644 index 00000000..fd601a2b --- /dev/null +++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue @@ -0,0 +1,705 @@ + + + + diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue new file mode 100644 index 00000000..306fc3f8 --- /dev/null +++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue @@ -0,0 +1,281 @@ + + + + + + + diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue new file mode 100644 index 00000000..ac3965ea --- /dev/null +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -0,0 +1,527 @@ + + + + + + diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue new file mode 100644 index 00000000..8ebb570e --- /dev/null +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -0,0 +1,973 @@ + + + + + + + + + \ No newline at end of file From 43e724bac709d0d60d86b44abb1f33e9f65cdbea Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 17 Jun 2022 09:37:40 +0800 Subject: [PATCH 02/68] 11 --- .../scss/modules/visual/fiveLayerMap.scss | 94 +++++++++++++++++++ .../communityGovern/fivelayers/mapIndex.vue | 72 +++----------- 2 files changed, 108 insertions(+), 58 deletions(-) diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss index cef83e7a..024fea4a 100644 --- a/src/assets/scss/modules/visual/fiveLayerMap.scss +++ b/src/assets/scss/modules/visual/fiveLayerMap.scss @@ -140,6 +140,100 @@ cursor: pointer; } } + + .div_category { + box-sizing: border-box; + width: 100%; + + height: calc(88vh - 302px - 10px); + color: #fff; + background: url('../../../img/modules/visual/warning-box.png') no-repeat + center; + background-size: 100% 100%; + // padding: 45px 21px 35px 24px; + + .info_loading { + margin-top: 50px; + } + .info_tip { + padding: 31px 0 0 19px; + display: flex; + > img { + height: 34px; + width: 46px; + } + + .tip_title { + line-height: 34px; + margin-left: 7px; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + } + } + + .info_list { + margin-top: 9px; + + .item { + .item_line { + margin-top: 13px; + margin-left: 24px; + width: 517px; + height: 0px; + border: 1px dotted #1797ff31; + border-width: 0.5px; + } + .last_line { + border: 1px dotted #1797ff00; + } + .list_item { + display: flex; + padding: 18px 59px 0; + justify-content: space-between; + + .list_item_col { + flex: 0 0 240px; + display: flex; + + > img { + height: 76px; + width: 76px; + } + + .item_content { + margin-left: 10px; + height: 76px; + display: flex; + flex-direction: column; + justify-content: center; + + .item_label { + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + } + .item_count { + margin-top: 10px; + font-size: 28px; + font-family: PingFang SC; + font-weight: bold; + color: #00fffc; + } + } + } + } + + ::v-deep .el-popper { + padding: 0px; + } + // + } + } + } + } .div_info { diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 8ebb570e..d6c82b5a 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -29,7 +29,7 @@
{{item.label}} @@ -56,14 +56,14 @@
-
+
- +
@@ -263,7 +263,7 @@ const vueGis = { centerFlag: 'point',//定义中心点的flag point点 fit 自适应 - coverageTypes: [//图层类型。五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层 + coverageTypesList: [//图层类型。五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层 { select: true, label: '综合治理图层', @@ -324,20 +324,20 @@ const vueGis = { //加载当前园区的标注 this.loadPolygon(this.subAgencyArray) this.setMapLocation() - await this.loadList() + await this.loadCategoryList() }, methods: { //点击图层 handleClickCoverage (index) { - this.coverageTypes[index].select = !this.coverageTypes[index].select - let item = this.coverageTypes[index] + this.coverageTypesList[index].select = !this.coverageTypesList[index].select + let item = this.coverageTypesList[index] - this.$set(this.coverageTypes, index, item) + this.$set(this.coverageTypesList, index, item) this.coverageTypes = [] - this.coverageTypes.forEach(element => { + this.coverageTypesList.forEach(element => { if (element.select) { this.coverageTypes.push(element.value) } @@ -349,53 +349,9 @@ const vueGis = { }, - - - - //获取右侧infolist数据 - async loadList () { - this.infoLoading = true - // const url = "/data/aggregator/coverage/dataList" - const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList" - let params = { - coverageTypes: this.coverageTypes, - categoryKeys: this.categoryKeys, - search: '', - pageNo: this.pageNo, - pageSize: this.pageSize - } - - const { data, code, msg } = await requestPost(url, params) - this.infoLoading = false - if (code === 0) { - this.listData = data - // this.listData = this.listData1 - this.listDatashow = [] - let itemArray = [] - this.listData.forEach((item, index) => { - if (!item.dataIcon) { - item.dataIcon = require('../../../../../assets/img/modules/visual/dibao.png') - } - - if (index % 2 === 0) {//偶数 - itemArray.push(item) - } else { - itemArray.push(item) - this.listDatashow.push(itemArray) - itemArray = [] - } - - }); - - - } else { - this.$message.error(msg) - } - }, - async loadCategoryList () { - // const url = "/data/aggregator/coverage/categoryList" - const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/categoryList" + // const url = "/gov/org/coverage/categoryList" + const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/categoryList" let params = { coverageTypes: this.coverageTypes, @@ -408,9 +364,9 @@ const vueGis = { this.categoryListshow = [] let itemArray = [] - this.listData.forEach((item, index) => { + this.categoryList.forEach((item, index) => { if (!item.dataIcon) { - item.dataIcon = require('../../../../assets/img/shuju/volunteer3.png') + item.dataIcon = require('../../../../../assets/img/shuju/volunteer3.png') } if (index % 4 === 0) {//偶数 From cb50f7c3ac53d711eb8ec1e5d442565ed5f23da6 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 17 Jun 2022 09:55:14 +0800 Subject: [PATCH 03/68] 11 --- src/assets/scss/modules/visual/fiveLayerMap.scss | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss index 024fea4a..66bf9855 100644 --- a/src/assets/scss/modules/visual/fiveLayerMap.scss +++ b/src/assets/scss/modules/visual/fiveLayerMap.scss @@ -145,12 +145,7 @@ box-sizing: border-box; width: 100%; - height: calc(88vh - 302px - 10px); - color: #fff; - background: url('../../../img/modules/visual/warning-box.png') no-repeat - center; - background-size: 100% 100%; - // padding: 45px 21px 35px 24px; + .info_loading { margin-top: 50px; From 900884aaf8c89190c70111482aef3a1fa09e3d30 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 17 Jun 2022 10:52:57 +0800 Subject: [PATCH 04/68] 11 --- .../scss/modules/visual/fiveLayerMap.scss | 181 ++++++-------- .../communityGovern/fivelayers/mapIndex.vue | 225 +++++++++++++++--- 2 files changed, 271 insertions(+), 135 deletions(-) diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss index 66bf9855..d203c0a1 100644 --- a/src/assets/scss/modules/visual/fiveLayerMap.scss +++ b/src/assets/scss/modules/visual/fiveLayerMap.scss @@ -49,7 +49,7 @@ } .div_data { - flex: 0 0 622px; + flex: 0 0 600px; margin-left: 12px; .div_search { @@ -115,7 +115,7 @@ background-size: 100% 100%; .div_coverage{ - padding: 30px 20px 30px 20px; + padding: 30px 10px 32px 10px; display: flex; justify-content: space-around; @@ -143,92 +143,65 @@ .div_category { box-sizing: border-box; - width: 100%; - - + height:238px; + padding:0 20px 20px; - .info_loading { - margin-top: 50px; - } - .info_tip { - padding: 31px 0 0 19px; + .category_item { + + margin-bottom: 15px; display: flex; - > img { - height: 34px; - width: 46px; - } - - .tip_title { - line-height: 34px; - margin-left: 7px; - font-size: 22px; - font-family: PingFang SC; - font-weight: 800; - color: #ffffff; - } - } - - .info_list { - margin-top: 9px; - - .item { - .item_line { - margin-top: 13px; - margin-left: 24px; - width: 517px; - height: 0px; - border: 1px dotted #1797ff31; - border-width: 0.5px; + justify-content: start; + + // margin:auto; + + + .list_item { + + // padding: 18px 59px 0; + justify-content: start; + flex:0 0 135px; + + > img { + height: 18px; + width: 18px; } - .last_line { - border: 1px dotted #1797ff00; + .item_content{ + width:100px; + + margin-left:8px; + font-size: 16px; + font-family: PingFang SC; + font-weight: 400; + color: #D2E7FF; } - .list_item { - display: flex; - padding: 18px 59px 0; - justify-content: space-between; - - .list_item_col { - flex: 0 0 240px; - display: flex; - - > img { - height: 76px; - width: 76px; - } - - .item_content { - margin-left: 10px; - height: 76px; - display: flex; - flex-direction: column; - justify-content: center; - - .item_label { - font-size: 18px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - } - .item_count { - margin-top: 10px; - font-size: 28px; - font-family: PingFang SC; - font-weight: bold; - color: #00fffc; - } - } - } + + .item_content_sel{ + color: #99c7fb; } + + } + + .list_item:hover{ + cursor: pointer; + } ::v-deep .el-popper { padding: 0px; } // - } + } + + } + .div_category { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; + } + } + + } .div_info { @@ -281,39 +254,35 @@ .list_item { display: flex; padding: 18px 59px 0; - justify-content: space-between; + justify-content: space-between; - .list_item_col { - flex: 0 0 240px; - display: flex; + > img { + height: 36px; + width: 36px; + } - > img { - height: 76px; - width: 76px; + .item_content { + margin-left: 10px; + height: 76px; + display: flex; + flex-direction: column; + justify-content: center; + + .item_label { + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; } - - .item_content { - margin-left: 10px; - height: 76px; - display: flex; - flex-direction: column; - justify-content: center; - - .item_label { - font-size: 18px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - } - .item_count { - margin-top: 10px; - font-size: 28px; - font-family: PingFang SC; - font-weight: bold; - color: #00fffc; - } + .item_count { + margin-top: 10px; + font-size: 28px; + font-family: PingFang SC; + font-weight: bold; + color: #00fffc; } } + } ::v-deep .el-popper { @@ -324,11 +293,7 @@ } } - .div_tips { - /deep/ .el-scrollbar__wrap { - overflow-x: hidden !important; - } - } + } } diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index d6c82b5a..5bc203db 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -35,32 +35,29 @@ {{item.label}} +
+ - - -
-
-
- -
-
{{colItem.categoryName}}
-
+
+ + {{colItem.categoryName}} + + -
-
+
-
- + +
+ - {{formData.contact}} + {{formData.areaCovered}} - - {{formData.contactMobile}} + {{formData.capacity}} - - {{formData.memberCount}} + {{formData.address}} - @@ -74,7 +74,7 @@
- + --> diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index f12353d1..8ddd65b6 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -10,22 +10,22 @@ class="form"> + placeholder="请输入场所名称" + v-model="formData.name"> - @@ -36,28 +36,57 @@ + --> + + + + + + 平方公里 + + + + 查询 - - + - - - - - - - @@ -145,23 +162,21 @@ export default { formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 btnDisable: false, - - unitId: '', + serviceList: [], + icCityManagementId: '', keyWords: '', formData: { - unitName: '', - serviceMatterList: [], - type: '', - contact: '', - contactMobile: '', - memberCount: 0, - remark: '', //备注【最大500字】 + name: '', + category: '',//场所分类字典表值 + areaCovered: '',//占地面积 + capacity: 0,//容纳人数 address: '', //详细地址 longitude: 36.0722275, //经度 latitude: 120.38945519 //纬度 }, - serviceList: [],//服务list + cityManagement: { + } } }, components: {}, @@ -194,10 +209,9 @@ export default { //获取服务事项下拉框 async loadService () { - const url = "/heart/serviceitem/dict-list" + const url = "/gov/org/coverage/dict-select-list/city_management" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/city_management" let params = { - type: 'usable' - // parentCategoryCode: '1010' } const { data, code, msg } = await requestPost(url, params) @@ -213,19 +227,18 @@ export default { //加载组织 async loadFormData () { - const url = '/heart/icpartyunit/detail' - // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail' + const url = '/gov/org/icCityManagement/detail' + // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/detail' let params = { - id: this.unitId + icCityManagementId: this.icCityManagementId } const { data, code, msg } = await requestPost(url, params) if (code === 0) { - if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) { - data.serviceMatterList = [] + if (null != data){ + data : this.cityManagement } - this.formData = { ...data } map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) this.setMarker(this.formData.latitude, this.formData.longitude) @@ -265,8 +278,8 @@ export default { // return false; // } - let url = '/heart/icpartyunit/save' - // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save" + let url = '/gov/org/icCityManagement/add' + // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/add" // if (this.formType === 'edit') { // this.formData.id = this.unitId // } @@ -410,13 +423,10 @@ export default { this.unitId = '' this.keyWords = '' this.formData = { - unitName: '', - serviceMatterList: [], - type: '', - contact: '', - contactMobile: '', - memberCount: 0, - remark: '', //备注【最大500字】 + name: '', + category: '',//场所分类字典表值 + areaCovered: '',//占地面积 + capacity: 0,//容纳人数 address: '', //详细地址 longitude: '', //经度 latitude: '' //纬度 @@ -442,27 +452,20 @@ export default { dataRule () { return { - unitName: [ - { required: true, message: '单位名称不能为空', trigger: 'blur' }, + name: [ + { required: true, message: '场所名称不能为空', trigger: 'blur' }, ], - type: [ - { required: true, message: '分类不能为空', trigger: 'blur' } - ], - - contact: [ - { required: true, message: '联系人不能为空', trigger: 'blur' } - ], - contactMobile: [ - { required: true, message: '联系电话不能为空', trigger: 'blur' } - ], - memberCount: [ - { required: true, message: '在职党员数不能为空', trigger: 'blur' } + categoryName: [ + { required: true, message: '场所类型不能为空', trigger: 'blur' } ], address: [ - { required: true, message: '详细地址不能为空', trigger: 'blur' } + { required: true, message: '地址不能为空', trigger: 'blur' } ], longitude: [ { required: true, message: '坐标不能为空', trigger: 'blur' } + ], + latitude: [ + { required: true, message: '坐标不能为空', trigger: 'blur' } ] } }, From 08fea835fd5fb638fb309a1cd3953f058dee7f05 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 17 Jun 2022 15:14:17 +0800 Subject: [PATCH 06/68] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/fiveLayerMap.scss | 197 ++---- .../communityGovern/fivelayers/mapIndex.vue | 610 +++++++++++++++--- src/views/modules/visual/cpts/tb.vue | 93 +-- 3 files changed, 654 insertions(+), 246 deletions(-) diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss index d203c0a1..2dd1e704 100644 --- a/src/assets/scss/modules/visual/fiveLayerMap.scss +++ b/src/assets/scss/modules/visual/fiveLayerMap.scss @@ -52,59 +52,6 @@ flex: 0 0 600px; margin-left: 12px; - .div_search { - width: 100%; - height: 56px; - text-align: center; - background-color: #011168; - border-radius: 4px 0 0 4px; - border: none; - box-shadow: 0 0 10px inset #1a5afd; - font-size: 18px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - opacity: 0.7; - display: flex; - justify-content: space-between; - .div_search_left { - display: flex; - justify-content: flex-start; - .icon { - display: flex; - align-items: center; - margin-left: 29px; - - > img { - width: 24px; - height: 24px; - } - } - - > span { - line-height: 56px; - margin-left: 10px; - } - } - - .btn { - text-align: center; - flex: 0 0 113px; - height: 56px; - background: linear-gradient(90deg, #1a5afd, #26c4ff); - font-size: 20px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - line-height: 56px; - border-radius: 0 4px 4px 0; - } - } - - .div_search:hover { - cursor: pointer; - } - .div_tips{ box-sizing: border-box; width: 100%; @@ -167,16 +114,15 @@ } .item_content{ width:100px; - margin-left:8px; font-size: 16px; font-family: PingFang SC; font-weight: 400; - color: #D2E7FF; + color: #e5effa; } .item_content_sel{ - color: #99c7fb; + color: #5da8fd; } } @@ -207,90 +153,89 @@ .div_info { box-sizing: border-box; width: 100%; - + margin-top:10px; height: calc(88vh - 302px - 10px); color: #fff; background: url('../../../img/modules/visual/warning-box.png') no-repeat center; background-size: 100% 100%; - // padding: 45px 21px 35px 24px; + padding: 32px 21px 20px 20px; - .info_loading { - margin-top: 50px; - } - .info_tip { - padding: 31px 0 0 19px; + .div_search_list { + margin: 0 auto; + text-align: center; + width: 559px; + height: 48px; + background: #01106800; + border-radius: 8px; display: flex; - > img { - height: 34px; - width: 46px; + justify-content: flex-end; + + .icon { + display: flex; + align-items: center; + margin-left: 29px; + margin-top: 16px; + + > img { + width: 24px; + height: 24px; + } } - - .tip_title { - line-height: 34px; - margin-left: 7px; - font-size: 22px; + + .btn { + text-align: center; + flex: 0 0 113px; + height: 53px; + background: #0082fb; + border-radius: 0px 8px 8px 0px; + font-size: 20px; font-family: PingFang SC; - font-weight: 800; + font-weight: 400; color: #ffffff; + line-height: 53px; + } + .btn:hover { + cursor: pointer; } } - - .info_list { - margin-top: 9px; - - .item { - .item_line { - margin-top: 13px; - margin-left: 24px; - width: 517px; - height: 0px; - border: 1px dotted #1797ff31; - border-width: 0.5px; - } - .last_line { - border: 1px dotted #1797ff00; - } - .list_item { - display: flex; - padding: 18px 59px 0; - justify-content: space-between; - - > img { - height: 36px; - width: 36px; - } - - .item_content { - margin-left: 10px; - height: 76px; - display: flex; - flex-direction: column; - justify-content: center; - - .item_label { - font-size: 18px; - font-family: PingFang SC; - font-weight: 400; - color: #ffffff; - } - .item_count { - margin-top: 10px; - font-size: 28px; - font-family: PingFang SC; - font-weight: bold; - color: #00fffc; - } - } - - } - - ::v-deep .el-popper { - padding: 0px; - } - // + + + .tb { + height: calc(88vh - 302px - 10px); + overflow-y: auto; + @include scrollBar; + margin-top:20px; + } + + .m-pagination { + position: absolute; + box-sizing: border-box; + right: 5px; + bottom: 5px; + width: 100%; + height: 40px; + display: flex; + justify-content: flex-end; + + /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { + background: #0266d1; + color: #000d3f; + } + + /deep/ .el-pagination .el-pager li { + background: #002e74; + } + + /deep/ .el-pagination .btn-prev { + background: #002e74; + } + + /deep/ .el-pagination .btn-next { + background: #002e74; } } + } diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 5bc203db..e41260db 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -59,48 +59,61 @@ +
- +
+ + +
+
+ - + @@ -126,7 +139,7 @@ import { Loading } from 'element-ui'; //引入Loading服务 import { requestPost } from "@/js/dai/request"; - +import cptTb from "@/views/modules/visual/cpts/tb"; import cptCard from "@/views/modules/visual/cpts/card"; import ScreenLoading from "@/views/modules/visual/cpts/loading"; @@ -296,7 +309,39 @@ const vueGis = { categoryKeys: [], search: '', pageNo: 1, - pageSize: 10 + pageSize: 10, + + demand: { + loading: true, + colList: [ + { + align: "center", + width: "5%", + }, + { + align: "center", + width: "10%", + }, + + ], + header: ["分类", "名称"], + list: [], + pageSize: 10, + pageNo: 1, + total: 0, + }, + + iconUrlArray: { + 'volunteer1': require('../../../../../assets/img/shuju/volunteer1.png'), + 'volunteer2': require('../../../../../assets/img/shuju/volunteer2.png'), + 'volunteer3': require('../../../../../assets/img/shuju/volunteer3.png'), + 'volunteer4': require('../../../../../assets/img/shuju/volunteer4.png'), + 'volunteer5': require('../../../../../assets/img/shuju/volunteer5.png'), + }, + iconArrays: [], + overlay: null, + showPopup: false, + } }, @@ -319,13 +364,186 @@ const vueGis = { //加载当前园区的标注 this.loadPolygon(this.subAgencyArray) + + this.setMapLocation() await this.loadCategoryList() + this.getTable(); + await this.getMapTable(); + + + //初始化icon图层 + this.addOverlay() + + this.addMapClick() }, methods: { + + //添加覆盖层 + addOverlay () { + // 使用变量存储弹窗所需的 DOM 对象 + var container = document.getElementById("popup"); + var closer = document.getElementById("popup-closer"); + var content = document.getElementById("popup-content"); + var goMore = document.getElementById("popup-goMore") ? document.getElementById("popup-goMore") : null + + // 创建一个弹窗 Overlay 对象 + this.overlay = new Overlay({ + element: container, //绑定 Overlay 对象和 DOM 对象的 + autoPan: true, // 定义弹出窗口在边缘点击时候可能不完整 设置自动平移效果 + autoPanAnimation: { + duration: 250 //自动平移效果的动画时间 9毫秒 + }, + zIndex: 100 + }); + // 将弹窗添加到 map 地图中 + map.addOverlay(this.overlay); + let _that = this; + + /** + * 为弹窗添加一个响应关闭的函数 + */ + closer.onclick = function () { + _that.overlay.setPosition(undefined); + closer.blur(); + return false; + }; + if (goMore) { + goMore.onclick = function () { + _that.$emit('lookMore') + }; + } + }, + + //注册地图点击事件 + addMapClick () { + let _that = this + + map.on("click", function (evt) { + const feature = map.forEachFeatureAtPixel(evt.pixel, function (feature) { + return feature; + }); + if (feature) { + console.log(feature) + _that.clickMapVolunteer(feature.values_.properties) + + } + + }); + }, + + //点击项目 + async clickMapVolunteer (info) { + + + if (!info.id) { + return false + } + + const url = "/epmetuser/icresiuser/resi-brief/" + 'dd0bd55db0ca4b629c40bc914a08368e' + // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution" + + let params = {} + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + let coordinate = [info.longitude, info.latitude] + data.gridName = data.gridName ? data.gridName : '--' + data.villageName = data.villageName ? data.villageName : '--' + data.icUserName = data.icUserName ? data.icUserName : '--' + data.mobile = data.mobile ? data.mobile : '--' + data.idCard = data.idCard ? data.idCard : '--' + data.birthday = data.birthday ? data.birthday : '--' + data.contacts = data.contacts ? data.contacts : '--' + data.contactsMobile = data.contactsMobile ? data.contactsMobile : '--' + + data.isBdhjShow = data.isBdhj ? data.isBdhj === '0' ? '否' : '是' : '--' + data.genderShow = data.gender ? data.gender === '0' ? '女' : '男' : '--' + let categoriesArray = [] + + for (let key in data.volunteerCategories) { + categoriesArray.push(data.volunteerCategories[key]) + + } + + + if (categoriesArray.length > 0) { + data.categories = categoriesArray.join(',') + } else { + data.categories = '--' + } + + let showData = ` +
居民信息
+
所属网格： + `+ data.gridName + ` +
+
所属小区： + `+ data.villageName + ` +
+
本地户籍： + `+ data.isBdhjShow + ` +
+
姓名： + `+ data.icUserName + ` +
+
手机： + `+ data.mobile + ` +
+
性别： + `+ data.genderShow + ` +
+
身份证号： + `+ data.idCard + ` +
+
出生日期： + `+ data.birthday + ` +
+
联系人： + `+ data.contacts + ` +
+
联系人手机： + `+ data.contactsMobile + ` +
+
志愿者类别： + `+ data.categories + ` +
+ ` + // console.log(showData) + this.handleShowPopup(showData, coordinate, true) + + } else { + this.$message.error(msg) + } + }, + + handleShowPopup (showData, coordinate, isShowMore) { + if (isShowMore) { + document.getElementById("popup-goMore").style.display = 'block' + } else { + document.getElementById("popup-goMore").style.display = 'none' + } + console.log(this.overlay.getElement()) + let content = document.getElementById("popup-content"); + this.overlay.getElement().style.display = 'block' + this.overlay.getElement().parentNode.style.display = 'block' + this.overlay.getElement().parentNode.parentNode.style.display = 'block' + content.innerHTML = showData; + this.overlay.setPosition(coordinate); + //把 overlay 显示到指定的 x,y坐标 + + }, + // 关闭弹窗 + handleClosePopup () { + this.overlay.setPosition(undefined); + document.getElementById("popup-closer").blur(); + return false; + }, + //点击图层 - handleClickCoverage (index) { + async handleClickCoverage (index) { this.coverageTypesList[index].select = !this.coverageTypesList[index].select let item = this.coverageTypesList[index] @@ -338,23 +556,51 @@ const vueGis = { this.coverageTypes.push(element.value) } }); + + await this.loadCategoryList() + this.getTable(); + this.getMapTable(); }, //点击类别 - handleClickCategory (index, colIndex) { - this.categoryListshow[index][colIndex].sel = !this.coverageTypesList[index].sel - this.categoryList[index].sel = !this.coverageTypesList[index].sel - let item = this.coverageTypesList[index] + async handleClickCategory (index, colIndex) { - this.$set(this.coverageTypesList, index, item) + this.categoryListshow[index][colIndex].sel = !this.categoryListshow[index][colIndex].sel - this.coverageTypes = [] + // this.categoryList[index * 4 + colIndex].sel = !this.categoryList[index * 4 + colIndex].sel - this.coverageTypesList.forEach(element => { - if (element.select) { - this.coverageTypes.push(element.value) + let array = this.categoryListshow[index] + let item = this.categoryListshow[index][colIndex] + + + this.$set(this.categoryListshow[index], colIndex, item) + this.$set(this.categoryListshow, index, array) + + this.categoryKeys = [] + + this.categoryList.forEach(element => { + if (element.sel) { + this.categoryKeys.push(element.categoryKey) } }); + + this.getTable(); + this.getMapTable(); + }, + handleSearch () { + + }, + // + handleClickRow (index) { + let selData = this.tableList[index] + mapView.setCenter([selData.longitude, selData.latitude]); + this.clickMapVolunteer(selData) + // alert(index) + }, + + handlePageNoChange_demand (val) { + this.demand.pageNo = val; + this.getTable(); }, async loadCategoryList () { @@ -370,14 +616,7 @@ const vueGis = { if (code === 0) { // this.categoryList = data this.categoryList = [ - { - categoryKey: "0", - categoryName: "deserunt" - }, - { - categoryKey: "1", - categoryName: "deserunt" - }, + { categoryKey: "2", categoryName: "deserunt" @@ -531,6 +770,7 @@ const vueGis = { categoryName: "deserunt" }, ] + this.categoryKeys = [] this.categoryListshow = [] let itemArray = [] @@ -541,6 +781,7 @@ const vueGis = { } item.sel = true + this.categoryKeys.push(item.categoryKey) }); @@ -551,12 +792,181 @@ const vueGis = { console.log(this.categoryListshow) + console.log(this.categoryList) } else { this.$message.error(msg) } }, + //加载组织数据 + async getTable (isPage) { + this.demand.loading = true + // const url = "/data/aggregator/coverage/dataList"; + const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList"; + let params = { + coverageTypes: this.coverageTypes, + categoryKeys: this.categoryKeys, + search: this.search, + pageNo: this.demand.pageNo, + pageSize: this.demand.pageSize, + isPage: true + }; + + const { data, code, msg } = await requestPost(url, params); + this.demand.loading = false; + + if (code === 0) { + + this.demand.total = data.total; + this.tableList = data.list + this.tableList = [ + { + categoryKey: "volunteer1", + content: "volunteer1", + id: "123", + latitude: "36.082230", + longitude: "120.3868167667315", + }, + { + categoryKey: "volunteer2", + content: "volunteer2", + id: "123", + latitude: "36.062227", + longitude: "120.389455", + }, + { + categoryKey: "volunteer3", + content: "volunteer3", + id: "123", + latitude: "36.072214", + longitude: "120.389455", + }, + { + categoryKey: "volunteer4", + content: "volunteer4", + id: "123", + latitude: "36.07394505338441", + longitude: "120.3868167667315", + } + ] + this.demand.list = data.list.map((item) => { + return [ + item.categoryKey ? item.categoryKey : '--', + item.content ? item.content : '', + + ]; + }); + } else { + this.$message.error(msg); + } + }, + //加载组织数据 + async getMapTable () { + + // const url = "/data/aggregator/coverage/dataList"; + const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList"; + let params = { + coverageTypes: this.coverageTypes, + categoryKeys: this.categoryKeys, + search: this.search, + + isPage: false + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.iconArrays = data.list + this.iconArrays = [ + { + categoryKey: "volunteer1", + content: "volunteer1", + id: "123", + latitude: "36.082230", + longitude: "120.3868167667315", + }, + { + categoryKey: "volunteer2", + content: "volunteer2", + id: "123", + latitude: "36.062227", + longitude: "120.389455", + }, + { + categoryKey: "volunteer3", + content: "volunteer3", + id: "123", + latitude: "36.072214", + longitude: "120.389455", + }, + { + categoryKey: "volunteer4", + content: "volunteer4", + id: "123", + latitude: "36.07394505338441", + longitude: "120.3868167667315", + } + ] + this.iconArrays.forEach((item, index) => { + + item.url = this.iconUrlArray[item.categoryKey] + + }); + console.log(this.iconArrays) + this.loadIcon() + } else { + this.$message.error(msg); + } + }, + + //加载icon图标 + loadIcon () { + + iconSource.clear()//清空多边形标注 + if (this.iconArrays && this.iconArrays.length > 0) { + + let iconFeatures = []; + + this.iconArrays.forEach((oneIcon, index) => { + //添加标注 + + let iconItem = new Feature({ + geometry: new Point([oneIcon.longitude, oneIcon.latitude]), + id: oneIcon.id, + properties: { + type: "icon", + info: { ...oneIcon } + } + }); + // console.log('oneIcon----', this.iconUrlArray[oneIcon.urlIndex]) + let iconStyle = new Style({ + image: new Icon({ + // anchor: [0.5, 0.5], + // imgSize: [32, 32], + // scale: 0.5, + // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0] + src: oneIcon.url + }), + // text: createTextStyle(oneIcon) + }); + + iconItem.setStyle(iconStyle); + + // if (this.distanceMax) { + // if (this.computedDistance(oneIcon.longitude, oneIcon.latitude, this.distanceMax)) { + // iconFeatures.push(iconItem); + // } + // } else { + iconFeatures.push(iconItem); + // } + + + }); + + iconSource.addFeatures(iconFeatures); + } + }, //刷新地图 async refreshMap (isRefreshView) { @@ -572,11 +982,11 @@ const vueGis = { //重置地图中心点 // if (isRefreshView) { - this.setMapLocation() + // this.setMapLocation() // } - await this.loadList() + await this.getTable(false); }, @@ -629,8 +1039,6 @@ const vueGis = { } mapView.setZoom(this.zoom); - - }, //返回所选组织 @@ -650,15 +1058,12 @@ const vueGis = { this.center = this.orgData.center this.zoom = this.orgData.zoom - - this.$nextTick(() => { this.refreshMap(true) this.$forceUpdate() }); - }, //加载组织数据 @@ -862,7 +1267,6 @@ const vueGis = { }, - //根据组织层级设置缩放级别 setZoom (agencyLevel) { if (agencyLevel === 'district') { @@ -922,10 +1326,6 @@ const vueGis = { //目标加载到map中 }) - map.on('singleclick', function (e) { - // console.log(e.coordinate) - // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326')); - }) //去除双击放大效果 const dblClickInteraction = map @@ -1000,11 +1400,11 @@ const vueGis = { map.addLayer(polygonLayer) - map.addInteraction(select); + // map.addInteraction(select); - select.on('select', e => { + // select.on('select', e => { - }); + // }); }, @@ -1022,11 +1422,6 @@ const vueGis = { }, - //取随机数 - getRndBetween (lowerLimit, upperLimit) { - return Math.floor(Math.random() * (upperLimit - lowerLimit + 1)) + lowerLimit; - }, - //开启加载动画 startLoading () { loading = Loading.service({ @@ -1074,7 +1469,7 @@ const vueGis = { ...mapGetters(["clientHeight"]) }, - components: { cptCard, ScreenLoading }, + components: { cptTb, cptCard, ScreenLoading }, } export default vueGis; @@ -1096,5 +1491,70 @@ export default vueGis; } - \ No newline at end of file diff --git a/src/views/modules/visual/cpts/tb.vue b/src/views/modules/visual/cpts/tb.vue index 317f438f..4b6c0f8c 100644 --- a/src/views/modules/visual/cpts/tb.vue +++ b/src/views/modules/visual/cpts/tb.vue @@ -1,68 +1,67 @@ From 8e8940149df3426d150a45ee8eee94bbe8dff9f7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 17 Jun 2022 16:39:18 +0800 Subject: [PATCH 09/68] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/ggfwtc/ggfw.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue index a8e363b6..4c5e3b66 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue @@ -605,6 +605,8 @@ export default { } diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue new file mode 100644 index 00000000..11a22dea --- /dev/null +++ b/src/views/modules/cpts/base/index.vue @@ -0,0 +1,451 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue new file mode 100644 index 00000000..79e71c99 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue @@ -0,0 +1,104 @@ + + + + + From 376a41343a75403d833e6369a8ceffef1d44160f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 20 Jun 2022 08:53:49 +0800 Subject: [PATCH 12/68] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/shuju/fiveLayer/anzhibangjiao.png | Bin 0 -> 265 bytes .../img/shuju/fiveLayer/buliangqingshaonian.png | Bin 0 -> 283 bytes src/assets/img/shuju/fiveLayer/shequjiaozheng.png | Bin 0 -> 305 bytes src/assets/img/shuju/fiveLayer/xfry.png | Bin 0 -> 300 bytes src/assets/img/shuju/fiveLayer/xidurenyuan.png | Bin 0 -> 295 bytes src/assets/img/shuju/fiveLayer/xiejiaorenyuan.png | Bin 0 -> 286 bytes .../fiveLayer/zhaoshizhaohuojingshenbing.png | Bin 0 -> 281 bytes src/assets/scss/modules/visual/fiveLayerMap.scss | 2 +- .../communityGovern/fivelayers/mapIndex.vue | 10 ++++++++++ 9 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/assets/img/shuju/fiveLayer/anzhibangjiao.png create mode 100644 src/assets/img/shuju/fiveLayer/buliangqingshaonian.png create mode 100644 src/assets/img/shuju/fiveLayer/shequjiaozheng.png create mode 100644 src/assets/img/shuju/fiveLayer/xfry.png create mode 100644 src/assets/img/shuju/fiveLayer/xidurenyuan.png create mode 100644 src/assets/img/shuju/fiveLayer/xiejiaorenyuan.png create mode 100644 src/assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png diff --git a/src/assets/img/shuju/fiveLayer/anzhibangjiao.png b/src/assets/img/shuju/fiveLayer/anzhibangjiao.png new file mode 100644 index 0000000000000000000000000000000000000000..bddde7a9194215855fd01a206a6b1ffb4d7d7d4a GIT binary patch literal 265 zcmV+k0rvihP)Px#!%0LzR47w*&aq0va1_Pi--%s<#jR5tp_6YQE>5me1eXq73y#@*2lvv&)h-;sDtPJP5wEaRoJC5Mma03hl zk>OqNRKiOky(+Pv^$iYXZ@3C*BWVAF!a5D;PA~%cz_FnP?0^s8t%URw#DqK|TYjlp P00000NkvXXu0mjfKx1h( literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/buliangqingshaonian.png b/src/assets/img/shuju/fiveLayer/buliangqingshaonian.png new file mode 100644 index 0000000000000000000000000000000000000000..43f6c15b83cdfbf4aea8f48fa72c16fc87bf0fbe GIT binary patch literal 283 zcmV+$0p$LPP)Px#)k#D_R47w*&%H}RaTLb!@AET~P!if5nr_h^E={c>LQ6xd5Kg-IvbhA6LsPW0 z>f)f_f6&kzk#>jHW(Nl^DEG*{bcG_H?QlLkoFjfRZCJsjc#;vAy)yjwkQ(4=bFRE}?8KS6}tAKj_>x9LJKK=BD5nSj&$ zgBCG*t=rx~nj)eMTmsJE3(*Ugj83|Gli#)>#NfXy1?Lf(1KBMo`oAW>W!H!+;1I|F hJ3wH@4Dr5l)YjL}J;Gt7DI)*?002ovPDHLkV1k}2dU*f< literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/shequjiaozheng.png b/src/assets/img/shuju/fiveLayer/shequjiaozheng.png new file mode 100644 index 0000000000000000000000000000000000000000..469937b07caf6fd941ebf25073f307c94aee3ddf GIT binary patch literal 305 zcmV-10nYx3P)Px#>q$gGR47w*&96%XaTv$(_vbs^7!EB)4V$1~*qOv)vWg5W2J1jfv*=y32>u8r zu~@Yj6#NhT3(he?(3?SxVla4c>>g3Pg9|?C`S85>JmPPf+m8#bR5~>y#&L32u3xaL z^yjP$c|reHu$bl4vC`dZ+!T@De~_5T5Jo%PZ=B_5cJsbg9;?0qqd7|LFg%#rDKs_x zXjSM^LI%C}czFKxc=GEPO>DhX$1BM)vX-GWfdhL&oRbW$!=vd?b3t?kYUOW=OOnEp zyde4%s{MmN>d5n-H&D7RTpeu0U`P;S_FPx#=1D|BR47wz&Ob{+VH5`N=Xt$gdM|eg%fY27@BIML($p#;xHz;5j&6Pj_i%B| zrJHPU|&LLJY83y|)!?u9AV{o#udDkUjKgUc^ z9EDc|4w9PWk(=vX{z1V5!QBK|%bK6>b=D|~LN5zF1N0LFspW0oH-B#$6)U7UTfK1W z=B9h()7ux)VX#`10000Px#;Ymb6R47wz%^^zz0T{;d|8veTJPdvVlVB7*oNzKRsfP?K2CHCP^E=qZV%4&s z;9T9gps*_<2E(e^U~o9RM-=biz&E`Q?~msdf3wuzTAfmGCTVQ>G>dO95&6$q1&Y$0 z0a9FK2kd5X_ojkY(&R;Ap+Jbk;d=MHM2r1q7zW`hFk2$$C&Om%xYD#d*xr-X5t8A# zHeHV%);b@*sBzz@e|^p+NG-#@Ai#_e7tZtRY@_$6C{3;qt@2G}@dUG}=q`B&!v7H% t+KL9rk?jM}yzq>nCN##pS$={^`x{kJNRmoivIqbG002ovPDHLkV1no2e+vKr literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/xiejiaorenyuan.png b/src/assets/img/shuju/fiveLayer/xiejiaorenyuan.png new file mode 100644 index 0000000000000000000000000000000000000000..59010c1f875cf4acbce4292615e193b038a16c46 GIT binary patch literal 286 zcmV+(0pb3MP)Px#*hxe|R47w*&Ob{+aTLb!@AE4R>0+;;sdpf$HMK?vE)K0iINcV#cWVjyGc-j@ zYb^~4z5qe4%^?mAuFVb(T@de)D|SPnGo8cpf#-M>o$IvR>08xAzScGDLEx%58h2E~o)-p!9_iii;{g z{49}uT;`eYoFY{bb-)2*&Px#(@8`@R47wz&M`{@aTv$(@9)nok~ExWTwsG!?;u>7TtkGGhE}1`&G+CgF0QsT z6!Z>!1riPpZPf*JheLycdQX&{C(<)L56_3^`H8=J#jiPBU)aJy?}+49kp8Tdp@?84 zIL~H5BP4#@M^nM+4r+zOgDv`?TwG&sz+r~Ky2m7)y-WV3aCe&sHd&FJoxuDTy+Fak zzc5@=a0NKv85pk7Lxs<=B1-o{&HPQ?30tP5b-fdO0mc8&CQsT{L~sLKJE$6V0P?^V fpqXJ$hPA%|6$CoFCMR=%00000NkvXXu0mjf`a5(? literal 0 HcmV?d00001 diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss index 2dd1e704..15ce8f9f 100644 --- a/src/assets/scss/modules/visual/fiveLayerMap.scss +++ b/src/assets/scss/modules/visual/fiveLayerMap.scss @@ -202,7 +202,7 @@ .tb { - height: calc(88vh - 302px - 10px); + height: calc(88vh - 302px - 10px - 90px); overflow-y: auto; @include scrollBar; margin-top:20px; diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index e41260db..d0f7ca7d 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -337,6 +337,16 @@ const vueGis = { 'volunteer3': require('../../../../../assets/img/shuju/volunteer3.png'), 'volunteer4': require('../../../../../assets/img/shuju/volunteer4.png'), 'volunteer5': require('../../../../../assets/img/shuju/volunteer5.png'), + + 'anzhibangjiao': require('../../../../../assets/img/shuju/fiveLayer/anzhibangjiao.png'), + 'buliangqingshaonian': require('../../../../../assets/img/shuju/fiveLayer/buliangqingshaonian.png'), + 'shequjiaozheng': require('../../../../../assets/img/shuju/fiveLayer/shequjiaozheng.png'), + 'xfry': require('../../../../../assets/img/shuju/fiveLayer/xfry.png'), + 'xidurenyuan': require('../../../../../assets/img/shuju/fiveLayer/xidurenyuan.png'), + 'xiejiaorenyuan': require('../../../../../assets/img/shuju/fiveLayer/xiejiaorenyuan.png'), + 'zhaoshizhaohuojingshenbing': require('../../../../../assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png'), + + }, iconArrays: [], overlay: null, From e9855788076753c9e2e7e58adda77f325dd9f54b Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 20 Jun 2022 10:02:07 +0800 Subject: [PATCH 13/68] 11 --- .../communityGovern/fivelayers/mapIndex.vue | 86 ++++++++++++++++++- 1 file changed, 82 insertions(+), 4 deletions(-) diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index d0f7ca7d..92adf224 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -436,7 +436,7 @@ const vueGis = { }); if (feature) { console.log(feature) - _that.clickMapVolunteer(feature.values_.properties) + _that.clickMapVolunteer(feature.values_.properties.info) } @@ -446,11 +446,45 @@ const vueGis = { //点击项目 async clickMapVolunteer (info) { - if (!info.id) { return false } + if (info.placeType === 'resi' || info.placeType === 'specil_resi') {//综合治理图层和公共服务图层中的失能人员、失智人员 + this.loadResi(info) + } + if (info.placeType === 'public_service') {//公共服务图层 + this.loadPublicService(info) + } + if (info.placeType === 'dangerous_chemicals') {//重点危化品企业 + + } + if (info.placeType === 'event') {//难点痛点 + + } + if (info.placeType === 'city_management') {//城市管理图层 + + } + if (info.placeType === 'community_org') {//社区自组织 + + } + if (info.placeType === 'superior_resource') {//优势资源 + + } + if (info.placeType === '') {//群租房 + + } + if (info.placeType === '') {//来自联建单位的机关直属部门 + + } + if (info.placeType === '') {//来自企事业查询的 + + } + + + }, + + async loadResi (info) { const url = "/epmetuser/icresiuser/resi-brief/" + 'dd0bd55db0ca4b629c40bc914a08368e' // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution" @@ -460,9 +494,9 @@ const vueGis = { if (code === 0) { let coordinate = [info.longitude, info.latitude] + data.icUserName = data.icUserName ? data.icUserName : '--' data.gridName = data.gridName ? data.gridName : '--' data.villageName = data.villageName ? data.villageName : '--' - data.icUserName = data.icUserName ? data.icUserName : '--' data.mobile = data.mobile ? data.mobile : '--' data.idCard = data.idCard ? data.idCard : '--' data.birthday = data.birthday ? data.birthday : '--' @@ -478,7 +512,6 @@ const vueGis = { } - if (categoriesArray.length > 0) { data.categories = categoriesArray.join(',') } else { @@ -529,6 +562,51 @@ const vueGis = { } }, + async loadPublicService (info) { + // const url = "/gov/org/icPublicService/detail" + const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail" + + let params = { + icPublicServiceId: info.id + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + let coordinate = [info.longitude, info.latitude] + data.name = data.name ? data.name : '--' + data.categoryName = data.categoryName ? data.categoryName : '--' + data.areaCovered = data.areaCovered ? data.areaCovered + '平方公里' : '--' + data.capacity = data.capacity ? data.capacity : '--' + data.address = data.address ? data.address : '--' + + + let showData = ` +
场所信息
+
场所名称： + `+ data.name + ` +
+
场所分类： + `+ data.categoryName + ` +
+
占地面积： + `+ data.areaCovered + ` +
+
容纳人数： + `+ data.capacity + ` +
+
地址： + `+ data.address + ` +
+ ` + // console.log(showData) + this.handleShowPopup(showData, coordinate, true) + + } else { + this.$message.error(msg) + } + }, + handleShowPopup (showData, coordinate, isShowMore) { if (isShowMore) { document.getElementById("popup-goMore").style.display = 'block' From 546bc935f41ca93b5f4cd6d23b6adcf14eee94c5 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 20 Jun 2022 11:06:25 +0800 Subject: [PATCH 14/68] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E5=BB=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/visual/fiveLayerMap.scss | 4 +- src/views/modules/cpts/base/cpts/edit.vue | 4 +- .../shequzhili/tuceng/anquan/weihua/index.vue | 104 ++++++++++++++++++ .../shequzhili/tuceng/anquan/xuncha/index.vue | 104 ++++++++++++++++++ .../shequzhili/tuceng/yingji/ziyuan/index.vue | 104 ++++++++++++++++++ 5 files changed, 316 insertions(+), 4 deletions(-) create mode 100644 src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue create mode 100644 src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue create mode 100644 src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss index 15ce8f9f..63b69152 100644 --- a/src/assets/scss/modules/visual/fiveLayerMap.scss +++ b/src/assets/scss/modules/visual/fiveLayerMap.scss @@ -97,7 +97,7 @@ margin-bottom: 15px; display: flex; - justify-content: start; + justify-content: flex-start; // margin:auto; @@ -105,7 +105,7 @@ .list_item { // padding: 18px 59px 0; - justify-content: start; + justify-content: flex-start; flex:0 0 135px; > img { diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index 176c1f8a..8222c786 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -33,7 +33,7 @@
- {{ item.value || "--" }} + {{ fmData[item.keyName] || "--" }}
@@ -55,7 +55,7 @@
- {{ item.value || "--" }} + {{ fmData[item.keyName] || "--" }}
diff --git a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue new file mode 100644 index 00000000..79e71c99 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue new file mode 100644 index 00000000..79e71c99 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue new file mode 100644 index 00000000..79e71c99 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue @@ -0,0 +1,104 @@ + + + + + From 2abe84d93f90ea334196dd871fbddb5c337311ea Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 20 Jun 2022 17:20:42 +0800 Subject: [PATCH 15/68] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/management/list-main.scss | 4 +- src/views/modules/cpts/base/cpts/edit.vue | 114 ++- src/views/modules/cpts/base/index.vue | 155 ++- src/views/modules/shequ/cpts/people-more.vue | 14 +- .../shequzhili/tuceng/anquan/weihua/index.vue | 111 ++- .../shequzhili/tuceng/yingji/ziyuan/index.vue | 98 +- .../shequzhili/tuceng/zhonghe/xinfang.vue | 896 ++++++++++++++++-- 7 files changed, 1192 insertions(+), 200 deletions(-) diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index 132b39be..922bfaf7 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -36,12 +36,12 @@ box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); border-radius: 4px; margin-top: 15px; - padding: 10px; + padding: 10px 20px; position: relative; .div_btn { margin-top: 10px; - margin-left: 10px; + // margin-left: 10px; display: flex; .btn_upload { diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index 8222c786..ec6637bc 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -2,6 +2,7 @@
+ + @@ -22,73 +26,114 @@ export default { data() { return { searchParams: [ + { field: "企业名称", keyName: "name", type: "input" }, { - field: "服务类别", - keyName: "serviceType", + field: "企业类型", + keyName: "category", + type: "select", + optionUrl: "/gov/org/coverage/dict-select-list/dangerous_chemicals", + optionUrlParams: {}, + optionList: [], + }, + { + field: "危化品种类", + keyName: "dangerType", type: "select", optionUrl: "/sys/dict/data/dictlist", optionUrlParams: { - dictType: "ic_service_type", + dictType: "ic_danger_type", }, optionList: [], }, - { field: "服务组织", keyName: "orgName", type: "input" }, - { field: "服务地址", keyName: "address", type: "input" }, - { field: "备注", keyName: "remark", type: "input" }, ], tableParams: [ { field: "序号", keyName: "", type: "no" }, - { field: "服务类别", keyName: "serviceType", type: "text" }, - { field: "服务组织名称", keyName: "orgName", type: "text" }, - { field: "服务地址", keyName: "address", type: "text" }, + { field: "企业名称", keyName: "name", type: "text" }, + { field: "企业类别", keyName: "categoryName", type: "text" }, + { field: "周边安全间距", keyName: "safeDistanceName", type: "text" }, + { field: "危化品种类", keyName: "dangerTypeName", type: "text" }, + { field: "经营地址", keyName: "address", type: "text" }, + { field: "负责人", keyName: "principalName", type: "text" }, + { field: "联系电话", keyName: "principalMobile", type: "text" }, { field: "备注", keyName: "remark", type: "text" }, ], - tableUrl: "/heart/icServiceOrg/list", - exportUrl: "/gov/project/icEvent/export", + tableUrl: "/gov/org/icDangerousChemicals/list", + mubanUrl: "/gov/org/icDangerousChemicals/download", + importUrl: "/gov/org/icDangerousChemicals/import", + exportUrl: "/gov/org/icDangerousChemicals/export", + + addUrl: "/gov/org/icDangerousChemicals/add", + editUrl: "/gov/org/icDangerousChemicals/edit", + infoUrl: "/gov/org/icDangerousChemicals/detail", + delUrl: "/gov/org/icDangerousChemicals/del", editParams: [ { - field: "服务类别", - keyName: "serviceType", + field: "企业名称", + keyName: "name", + type: "input", + maxlength: 100, + editDisabled: true, + rules: [ + { + required: true, + message: "企业名称不能为空", + trigger: "blur", + }, + ], + }, + { + field: "企业分类", + keyName: "category", type: "select", - optionUrl: "/sys/dict/data/dictlist", + optionUrl: "/gov/org/coverage/dict-select-list/dangerous_chemicals", optionUrlParams: { - dictType: "ic_service_type", + // dictType: "ic_service_type", }, optionList: [], editDisabled: true, rules: [ - { required: true, message: "服务类别不能为空", trigger: "blur" }, + { required: true, message: "企业分类不能为空", trigger: "blur" }, ], }, { - field: "服务组织", - keyName: "orgName", - type: "input", - maxlength: 100, + field: "周边安全间距", + keyName: "safeDistance", + type: "number", + min: 0, + max: 1000000000, + unitName: "公里", + }, + { + field: "危化品种类", + keyName: "dangerType", + type: "select", + optionUrl: "/sys/dict/data/dictlist", + optionUrlParams: { + dictType: "ic_danger_type", + }, + optionList: [], editDisabled: true, - rules: [ - { - required: true, - message: "服务组织名称不能为空", - trigger: "blur", - }, - ], }, + { field: "负责人", keyName: "principalName", type: "input" }, + { field: "联系电话", keyName: "principalMobile", type: "input" }, { - field: "服务地址", + field: "经营地址", keyName: "address", type: "address", supKeys: ["longitude", "latitude"], supValues: ["", ""], + rules: [ + { + required: true, + message: "经营地址坐标不能为空", + trigger: "blur", + }, + ], }, - { field: "备注", keyName: "remark", type: "input" }, + { field: "备注", keyName: "remark", type: "textarea" }, ], - - addUrl: "/heart/icServiceOrg/add", - editUrl: "/heart/icServiceOrg/edit", - delUrl: "/heart/icServiceOrg/del", }; }, components: { basePage }, diff --git a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue index 79e71c99..1d8aa749 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue @@ -7,8 +7,12 @@ :addUrl="addUrl" :editUrl="editUrl" :delUrl="delUrl" + :infoUrl="infoUrl" :exportUrl="exportUrl" + :importUrl="importUrl" + :mubanUrl="mubanUrl" :editParams="editParams" + idName="icSuperiorResourceId" >
@@ -22,73 +26,95 @@ export default { data() { return { searchParams: [ + { field: "场所名称", keyName: "name", type: "input" }, { - field: "服务类别", + field: "场所分类", keyName: "serviceType", type: "select", - optionUrl: "/sys/dict/data/dictlist", - optionUrlParams: { - dictType: "ic_service_type", - }, + optionUrl: "/gov/org/coverage/dict-select-list/superior_resource", + optionUrlParams: {}, optionList: [], }, - { field: "服务组织", keyName: "orgName", type: "input" }, - { field: "服务地址", keyName: "address", type: "input" }, - { field: "备注", keyName: "remark", type: "input" }, ], tableParams: [ { field: "序号", keyName: "", type: "no" }, - { field: "服务类别", keyName: "serviceType", type: "text" }, - { field: "服务组织名称", keyName: "orgName", type: "text" }, - { field: "服务地址", keyName: "address", type: "text" }, - { field: "备注", keyName: "remark", type: "text" }, + { field: "场所名称", keyName: "name", type: "text" }, + { field: "场所类别", keyName: "categoryName", type: "text" }, + { field: "占地面积", keyName: "areaCoveredName", type: "text" }, + { field: "容纳人数", keyName: "capacityName", type: "text" }, + { field: "地址", keyName: "address", type: "text" }, ], - tableUrl: "/heart/icServiceOrg/list", - exportUrl: "/gov/project/icEvent/export", + tableUrl: "/gov/org/icSuperiorResource/list", + mubanUrl: "/gov/org/icSuperiorResource/download", + importUrl: "/gov/org/icSuperiorResource/import", + exportUrl: "/gov/org/icSuperiorResource/export", + + addUrl: "/gov/org/icSuperiorResource/add", + editUrl: "/gov/org/icSuperiorResource/edit", + infoUrl: "/gov/org/icSuperiorResource/detail", + delUrl: "/gov/org/icSuperiorResource/del", editParams: [ { - field: "服务类别", + field: "场所名称", + keyName: "name", + type: "input", + maxlength: 100, + editDisabled: true, + rules: [ + { + required: true, + message: "场所名称不能为空", + trigger: "blur", + }, + ], + }, + { + field: "场所分类", keyName: "serviceType", type: "select", - optionUrl: "/sys/dict/data/dictlist", + optionUrl: "/gov/org/coverage/dict-select-list/superior_resource", optionUrlParams: { - dictType: "ic_service_type", + // dictType: "ic_service_type", }, optionList: [], editDisabled: true, rules: [ - { required: true, message: "服务类别不能为空", trigger: "blur" }, + { required: true, message: "场所分类不能为空", trigger: "blur" }, ], }, { - field: "服务组织", - keyName: "orgName", - type: "input", - maxlength: 100, - editDisabled: true, - rules: [ - { - required: true, - message: "服务组织名称不能为空", - trigger: "blur", - }, - ], + field: "占地面积", + keyName: "areaCovered", + type: "number", + min: 0, + max: 1000000000, + unitName: "平方公里", + }, + { + field: "容纳人数", + keyName: "capacity", + type: "number", + min: 0, + max: 1000000000, + // unitName: "个", }, { - field: "服务地址", + field: "位置坐标", keyName: "address", type: "address", supKeys: ["longitude", "latitude"], supValues: ["", ""], + rules: [ + { + required: true, + message: "地址坐标不能为空", + trigger: "blur", + }, + ], }, - { field: "备注", keyName: "remark", type: "input" }, ], - - addUrl: "/heart/icServiceOrg/add", - editUrl: "/heart/icServiceOrg/edit", - delUrl: "/heart/icServiceOrg/del", }; }, components: { basePage }, diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue index 79e71c99..0b98fd9e 100644 --- a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue +++ b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue @@ -1,104 +1,840 @@ - + From dfab25b1520a143920d444098baf00de8f8c82d1 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 20 Jun 2022 17:39:25 +0800 Subject: [PATCH 16/68] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E4=BA=94?= =?UTF-8?q?=E5=A4=A7=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../img/shuju/fiveLayer/anzhibangjiao.png | Bin 265 -> 467 bytes .../shuju/fiveLayer/buliangqingshaonian.png | Bin 283 -> 501 bytes src/assets/img/shuju/fiveLayer/cm_bhsc.png | Bin 0 -> 534 bytes src/assets/img/shuju/fiveLayer/cm_cjsc.png | Bin 0 -> 526 bytes src/assets/img/shuju/fiveLayer/cm_nmsc.png | Bin 0 -> 582 bytes src/assets/img/shuju/fiveLayer/co_lwh.png | Bin 0 -> 640 bytes src/assets/img/shuju/fiveLayer/co_lyjlb.png | Bin 0 -> 557 bytes src/assets/img/shuju/fiveLayer/co_qt.png | Bin 0 -> 580 bytes src/assets/img/shuju/fiveLayer/co_whdw.png | Bin 0 -> 560 bytes src/assets/img/shuju/fiveLayer/co_yjdw.png | Bin 0 -> 542 bytes src/assets/img/shuju/fiveLayer/co_zaxld.png | Bin 0 -> 563 bytes src/assets/img/shuju/fiveLayer/dc_jqz.png | Bin 0 -> 608 bytes src/assets/img/shuju/fiveLayer/dc_jyz.png | Bin 0 -> 608 bytes src/assets/img/shuju/fiveLayer/dc_jzgd.png | Bin 0 -> 608 bytes src/assets/img/shuju/fiveLayer/dc_whpdw.png | Bin 0 -> 608 bytes src/assets/img/shuju/fiveLayer/dc_yqhjz.png | Bin 0 -> 608 bytes src/assets/img/shuju/fiveLayer/ep_cycs.png | Bin 0 -> 608 bytes src/assets/img/shuju/fiveLayer/ep_gwylcs.png | Bin 0 -> 608 bytes src/assets/img/shuju/fiveLayer/ep_lg.png | Bin 0 -> 557 bytes src/assets/img/shuju/fiveLayer/ep_lssd.png | Bin 0 -> 510 bytes src/assets/img/shuju/fiveLayer/ep_mrxycs.png | Bin 0 -> 608 bytes src/assets/img/shuju/fiveLayer/ep_scjgqy.png | Bin 0 -> 608 bytes src/assets/img/shuju/fiveLayer/ep_wb.png | Bin 0 -> 608 bytes src/assets/img/shuju/fiveLayer/ep_xx.png | Bin 0 -> 666 bytes src/assets/img/shuju/fiveLayer/ep_yy.png | Bin 0 -> 662 bytes src/assets/img/shuju/fiveLayer/event_tdnd.png | Bin 0 -> 526 bytes src/assets/img/shuju/fiveLayer/gr_czw.png | Bin 0 -> 713 bytes src/assets/img/shuju/fiveLayer/ps_jjz.png | Bin 0 -> 713 bytes src/assets/img/shuju/fiveLayer/ps_lyy.png | Bin 0 -> 662 bytes src/assets/img/shuju/fiveLayer/ps_mzb.png | Bin 0 -> 667 bytes src/assets/img/shuju/fiveLayer/ps_wss.png | Bin 0 -> 668 bytes src/assets/img/shuju/fiveLayer/ps_zs.png | Bin 0 -> 661 bytes src/assets/img/shuju/fiveLayer/pu_jgzsbm.png | Bin 0 -> 564 bytes src/assets/img/shuju/fiveLayer/resi_snry.png | Bin 0 -> 698 bytes src/assets/img/shuju/fiveLayer/resi_szry.png | Bin 0 -> 776 bytes src/assets/img/shuju/fiveLayer/resi_xfry.png | Bin 0 -> 541 bytes .../img/shuju/fiveLayer/shequjiaozheng.png | Bin 305 -> 501 bytes src/assets/img/shuju/fiveLayer/sr_djc.png | Bin 0 -> 565 bytes src/assets/img/shuju/fiveLayer/sr_gc.png | Bin 0 -> 597 bytes src/assets/img/shuju/fiveLayer/sr_ggld.png | Bin 0 -> 567 bytes src/assets/img/shuju/fiveLayer/sr_gy.png | Bin 0 -> 570 bytes src/assets/img/shuju/fiveLayer/sr_jzz.png | Bin 0 -> 565 bytes src/assets/img/shuju/fiveLayer/sr_rfqck.png | Bin 0 -> 597 bytes src/assets/img/shuju/fiveLayer/sr_tyc.png | Bin 0 -> 560 bytes src/assets/img/shuju/fiveLayer/sr_xfz.png | Bin 0 -> 569 bytes src/assets/img/shuju/fiveLayer/sr_yjy.png | Bin 0 -> 569 bytes src/assets/img/shuju/fiveLayer/xfry.png | Bin 300 -> 0 bytes .../img/shuju/fiveLayer/xidurenyuan.png | Bin 295 -> 501 bytes .../img/shuju/fiveLayer/xiejiaorenyuan.png | Bin 286 -> 501 bytes .../fiveLayer/zhaoshizhaohuojingshenbing.png | Bin 281 -> 488 bytes .../scss/modules/visual/fiveLayerMap.scss | 46 +- .../communityGovern/fivelayers/mapIndex.vue | 939 ++++++++++++------ 52 files changed, 655 insertions(+), 330 deletions(-) create mode 100644 src/assets/img/shuju/fiveLayer/cm_bhsc.png create mode 100644 src/assets/img/shuju/fiveLayer/cm_cjsc.png create mode 100644 src/assets/img/shuju/fiveLayer/cm_nmsc.png create mode 100644 src/assets/img/shuju/fiveLayer/co_lwh.png create mode 100644 src/assets/img/shuju/fiveLayer/co_lyjlb.png create mode 100644 src/assets/img/shuju/fiveLayer/co_qt.png create mode 100644 src/assets/img/shuju/fiveLayer/co_whdw.png create mode 100644 src/assets/img/shuju/fiveLayer/co_yjdw.png create mode 100644 src/assets/img/shuju/fiveLayer/co_zaxld.png create mode 100644 src/assets/img/shuju/fiveLayer/dc_jqz.png create mode 100644 src/assets/img/shuju/fiveLayer/dc_jyz.png create mode 100644 src/assets/img/shuju/fiveLayer/dc_jzgd.png create mode 100644 src/assets/img/shuju/fiveLayer/dc_whpdw.png create mode 100644 src/assets/img/shuju/fiveLayer/dc_yqhjz.png create mode 100644 src/assets/img/shuju/fiveLayer/ep_cycs.png create mode 100644 src/assets/img/shuju/fiveLayer/ep_gwylcs.png create mode 100644 src/assets/img/shuju/fiveLayer/ep_lg.png create mode 100644 src/assets/img/shuju/fiveLayer/ep_lssd.png create mode 100644 src/assets/img/shuju/fiveLayer/ep_mrxycs.png create mode 100644 src/assets/img/shuju/fiveLayer/ep_scjgqy.png create mode 100644 src/assets/img/shuju/fiveLayer/ep_wb.png create mode 100644 src/assets/img/shuju/fiveLayer/ep_xx.png create mode 100644 src/assets/img/shuju/fiveLayer/ep_yy.png create mode 100644 src/assets/img/shuju/fiveLayer/event_tdnd.png create mode 100644 src/assets/img/shuju/fiveLayer/gr_czw.png create mode 100644 src/assets/img/shuju/fiveLayer/ps_jjz.png create mode 100644 src/assets/img/shuju/fiveLayer/ps_lyy.png create mode 100644 src/assets/img/shuju/fiveLayer/ps_mzb.png create mode 100644 src/assets/img/shuju/fiveLayer/ps_wss.png create mode 100644 src/assets/img/shuju/fiveLayer/ps_zs.png create mode 100644 src/assets/img/shuju/fiveLayer/pu_jgzsbm.png create mode 100644 src/assets/img/shuju/fiveLayer/resi_snry.png create mode 100644 src/assets/img/shuju/fiveLayer/resi_szry.png create mode 100644 src/assets/img/shuju/fiveLayer/resi_xfry.png create mode 100644 src/assets/img/shuju/fiveLayer/sr_djc.png create mode 100644 src/assets/img/shuju/fiveLayer/sr_gc.png create mode 100644 src/assets/img/shuju/fiveLayer/sr_ggld.png create mode 100644 src/assets/img/shuju/fiveLayer/sr_gy.png create mode 100644 src/assets/img/shuju/fiveLayer/sr_jzz.png create mode 100644 src/assets/img/shuju/fiveLayer/sr_rfqck.png create mode 100644 src/assets/img/shuju/fiveLayer/sr_tyc.png create mode 100644 src/assets/img/shuju/fiveLayer/sr_xfz.png create mode 100644 src/assets/img/shuju/fiveLayer/sr_yjy.png delete mode 100644 src/assets/img/shuju/fiveLayer/xfry.png diff --git a/src/assets/img/shuju/fiveLayer/anzhibangjiao.png b/src/assets/img/shuju/fiveLayer/anzhibangjiao.png index bddde7a9194215855fd01a206a6b1ffb4d7d7d4a..42152b04d6b2a6469dbc61353398752d1e0d424d 100644 GIT binary patch literal 467 zcmV;^0WAKBP)Px$jY&j7R5(wil+8<2Q5eR5&xj#GCbSY~ZXYUvn-ZkOSZ&$_F2Z%Y7PV`qTmJwT zt!w4NZ6>dq8AHwW+=~tS4a;IkDn%z@_Mc{6ewqySu1tr2&yVvj$=u3eebikdG^fj~Ci9x}BBzO%;7XOY7Ps-9v zTC^>5bltvHg;Bu^;6j5_%`hQ&AHzCQttGX*Jt%l4xCe{?xlplzb;GLR)tZ4CK!N+K#3E1Qgu%tOo@3 z-=N<9f?e;H{!DZ~a2dD=bp0KHW8e^|7!Go<1AH=kj-};6eG{P+8JYk9002ov JPDHLkV1k6n$xQ$N literal 265 zcmV+k0rvihP)Px#!%0LzR47w*&aq0va1_Pi--%s<#jR5tp_6YQE>5me1eXq73y#@*2lvv&)h-;sDtPJP5wEaRoJC5Mma03hl zk>OqNRKiOky(+Pv^$iYXZ@3C*BWVAF!a5D;PA~%cz_FnP?0^s8t%URw#DqK|TYjlp P00000NkvXXu0mjfKx1h( diff --git a/src/assets/img/shuju/fiveLayer/buliangqingshaonian.png b/src/assets/img/shuju/fiveLayer/buliangqingshaonian.png index 43f6c15b83cdfbf4aea8f48fa72c16fc87bf0fbe..56b95be1e2ea772a66f1388ad35d66cfff5ce012 100644 GIT binary patch literal 501 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1IglL0;0*`@!lRsFwJ@&8)Q{~I;`Z&&`mUjF}P`Ty$`|F2j6 zzX?QD|8D@fRUnZY75{GnQ58rWC~^acfPz3ZK*3571BigSpo(E4$jTrJK-%H5Br=@u zL_Ps}#;GL8FPMReg^P!mPe4LaNmX4-SKrvu*4aNHEhDS2sJOJcyJzyECCk@s*|GP~ z;iJcnpFDTv>Ycmy?mv3`_$g_2=(D&lztw15NAkba4!kkPJP@%GBh*z;fVd zo{!EO7glCr?(hHmgDf5L+2&OopK&eu$7GWq8{fJKUeb8M!K-;jP%1b=X@QT%48b2p z{J%ne2#K*;w>tbfvOb#6{;K-Pa9;bY$9|V`MMWz%*Px#)k#D_R47w*&%H}RaTLb!@AET~P!if5nr_h^E={c>LQ6xd5Kg-IvbhA6LsPW0 z>f)f_f6&kzk#>jHW(Nl^DEG*{bcG_H?QlLkoFjfRZCJsjc#;vAy)yjwkQ(4=bFRE}?8KS6}tAKj_>x9LJKK=BD5nSj&$ zgBCG*t=rx~nj)eMTmsJE3(*Ugj83|Gli#)>#NfXy1?Lf(1KBMo`oAW>W!H!+;1I|F hJ3wH@4Dr5l)YjL}J;Gt7DI)*?002ovPDHLkV1k}2dU*f< diff --git a/src/assets/img/shuju/fiveLayer/cm_bhsc.png b/src/assets/img/shuju/fiveLayer/cm_bhsc.png new file mode 100644 index 0000000000000000000000000000000000000000..70b91933f5b6e07a7c475cd584da7b4ed3c83c46 GIT binary patch literal 534 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1Igs{uYCu0WdM ze}m<*P~$Vc<|jOjce_{}4K&{CX@1bh?68;lAwSdoUM2_qEDn2_9q=|i=w*7y$Mm4L z`5_+=_kfQXm|=Fv*9^!$0F?4EJ>+eEz}M^`NET>_=|NwRQHOw}H%Rc1kNE*0!xy9% ztRBb)D+8MeRCy4n7pM`a2BaOr1+qa1Y#_)Y2p32K?S-=843O--PMtQOzuZcK{DK*n zIJx-v#gtXm^b8EmZS9^QlNtD<4=lK&^Bc3ona;Wg=4p?1KeT?Znr z^V#zm1^w<^lDz7l-=rn>317T!3;0}ldp7#@vqML;jBn2I{Iuk~GtbUFlBb^d-b_C6 z_bP0l+XkKwDIa& literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/cm_cjsc.png b/src/assets/img/shuju/fiveLayer/cm_cjsc.png new file mode 100644 index 0000000000000000000000000000000000000000..929bce9af1ab9913eb46124f8bb98965c15d2559 GIT binary patch literal 526 zcmV+p0`dKcP)Px$$Vo&&R5(wqlsjk?Q51&1|1LCZ zX8BzY{!-RTJ!zvz<&tN=X&wk?tL1nfq+!EK$P(LPTTcSUBW=J&Hcw0&)($H4Xu z<$RQE`lq-#be!*5#5mGKD_-35f$i@V)V|}3uql(ma;RS=2S}JU^(D= z7Q0Cw=HqG1Iibtlj0>aZz}AwpkzY-`;DE0(na1vFCCpD2K(Gs4K=1#8O18e)#3ROh zz@;p5*L*cUkwtC_+4Px%07*naR5(wql)Y;dK^VrLXXX&i?gk9W=0q&SLvPm)A_ldQ2!fT`igx-3_<SUtv3>i9={SNUU- zPgC)xL2ggQBwv!5(YDU1=W78?#UBB2Z8=s*ozaBedng`SEfNtBd`rbgZ3}Zxxnp`h zjYrkJcL=$%wC1?&1}9TTZ$KVyaGV(sBfs>*l@82B7RE;??hkX-gVX!b%l4ocEj+bAdtaDc#+ z0Q&&s*DFL2HN+2+=bwaPkF~hPGHTI=s-1P*;{7P}hMa7v-^_T|k>PDfW6ufb0~8O| zVwKAP7Fj=Ixuu~f%-?mg<;w|>nm3z(zOH~`#Cx35D;S8v{5>aIzGOmw7#cS= z462Ll)}X~D(BR*ICZSZ1)fwp7*_^$(w&}dpU3?f-^0%Ds@_-4wtI!;6>gZ?1`y@)` zP>;tzD3H4#cm=Qzj3+2OE(*zBqcKlY^(O%I0&rF`lO{-n=?p|o`s`cF|IvED-|4f^ UL6u$k@c;k-07*qoM6N<$f@CNLP5=M^ literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/co_lwh.png b/src/assets/img/shuju/fiveLayer/co_lwh.png new file mode 100644 index 0000000000000000000000000000000000000000..4143d8f0de6cc331a5cb894205d2870c3be32deb GIT binary patch literal 640 zcmV-`0)PF9P)Px%I!Q!9R5(walTS!gQ5eO~d1IRTUJ~dV4O#{18>JG1C< z`)d#+VMIh08nmcQ)HW!Hh*|_ig}w7U9|KqW|`Y%mBZhcx*MKzv0^&au$wS13BHlEmE`mCs-fop24wf$@(=g|nLA5CRk z_kJ=TZ9MS0EQ{BmKVic?S0$iGCl>Z@@c5YQ+1~-S$9b_ zl~*M{ECgM4;{JtyKm!1dM>?Cuwu&16T`pQsKW${1oa*FYe%MhoLg&ieliiVVD%f~`maAHsd(I`-lfo3VIe<35G*&T?Dl(Xn@dL z(6Rs{W7tgMKtWJCeq;951>+cb80Q_7Dh(rlw a;=ch2cKo}JZsxQA0000Px$=Sf6CR5(walRan@Q51#0GeM$(V5gOJ(87630-`8bsFf=-8vQKj z6A%m%5fP&p!9p9^S+EflL_`ab%q&=lg@qu3*cu7wT$!D9H@o>+lGk1CJKw$MJf2wT zMDYk{A7)?KpgR=Zw-xUKTDBR*`$4Y|Z!rdd7lf|3c2H&R0Om~*x&oE>80L)<`g=Nq z%GE8%MnS!pEg;(o+6~+W4g%XSW&gHC}3Kp_W3@i=H2 z(->%5O#&IaJdOevei#EH=;z~qIw*sk?xVI zpFw}F6(p__xJwOTIhjSASd`r^LifIIZ2?n1CI4eH?Elu_0->8+w9yPO(gf)x*cV_2 zuoq(*PYHqlsLdJ|30)R&exl?daJ<87{w8!i?Vz8)Yv2!NoA7i9V`B%>6Iz^M*7{v(T5?>Px${z*hZR5(walRIb>Q5c24GZxW+*lA@Qw21C(KokWFwKBUKB_O8pfdL_qfLi*D zAQ(gu5u+r6g*IX`YYIU@M6{6XtPu;bunADu$EOmLO6P{yUA-W7t%dxuu8&u4B7Xc$tMY&?$2QdRt ztZgkpJ)K@#TfqQgwZxoFr(mnZ4V&G-dcCG}K=6w<~0=!HTu1J`GHko0dqj7=hjjDQ>X+qD+98E+i zfLsPDg&s0oMGQt2U9SsEp|2SR>vO~Ya;!(0Chy~hArjVDoM-|G&QHcVHxD#sI5N-j zz9`m2IxmDiCb(S_`KgNH=8DXPsH(GdVKMYLaJW8Kz?R8rz4>cxE(pj^OzV9k?7B6Z z)8(oz)`f-8qk{f<6+JV20yYY^lg44*MpfNwwkFO@R+I*ujbiA#z@Zj@^Jf&Rz1bRk z2VMZbfmOgBVC9k^@iD5X<6ltAr?kL<4^gZQi-Ke>CGeyXw6f3_ve^OzCGP0InL8k=DibH0;yz2WP!K&CAa>;3?_m(wct SYv^zQ0000Px$>PbXFR5(walRan@Q4q&}vr5!Ju+z#qXb}w&L{YF%t0-a!h$%GL-P5ppB%qdl zI~g(z5vg@qu3*cu6%8@an>Z?h(MdaruJ%=~8l^WF$+ zosyS9NJk&C-hGNK91Sf z9<*?73tj7ds?vk71lkAe1vMatfo-4#el6!2&wq=7g-kbRi;Fe8A+4Ofi0aK&6(ipW zj=5LA7rjB&Ng3q_Y7I9)p??9G240|g3riGb185GUH!h$uj2k?t+a-Sy#0HKd+8=e~ zO`pO8z+YTZD1k+8o~`8HbCAuB9p*oM9!x`T*Eb2n;@?YG8WsSC$Q%pMdNT$ zEn?{aV{>m-f{-bk;7XiW_A4l(&DqHwoZxjdjwP@LaAw~ph8;;mF5v{%6QBZ0rYVi5 zSbRcd2k3ra29dYe!QHg9%eW?&kah>;Ov~3)e&U+$w6yP_&w<~-Cg2FLvCX&mh+}$F zpnv#D=@8)qw%OhabOZEpB5!n6ne9PZLF5&Pg;o`$wzS9o>Ujky^iG1@??6~BPx$*hxe|R5(walTV1vQ545N-&Y!5$!?T-zo%v~vA{G+L|I@pB$|@h_!Fh3Okru5 z8Kq1bNisB}EZB&xGBrsoEJRsIQNKHblC2S$_tkygZ#=Iz@8zATL70c@v(m@K?#6x9J6vsVFTphM4A=-f4$|)b1|{|mU^GZwMf;$kKS*1ef;#N> zpU^K@4*W2z6KpnI%fU`V0T^EbH{MHMGTbUJ&1n6K9Pd~!wSKvTF_9C&S!xIdqQxe3bZek9#)bc18xesQ|V=8D7sw8x-fP1bu?_t$<>TVMK|2i$7EU gxfM{H$r7ym4XGozHSAve+5i9m07*qoM6N<$f;Up|TmS$7 literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/co_zaxld.png b/src/assets/img/shuju/fiveLayer/co_zaxld.png new file mode 100644 index 0000000000000000000000000000000000000000..9c3a9c6b258c6c9215227a11b326205c3cf4e109 GIT binary patch literal 563 zcmV-30?hr1P)Px$?MXyIR5(walRsz_K@^9-w^u|1!A?bIZG#qZ_f8PSKni1}B1%9^;~xwNfdtf2 zjX6O`5QB&qB@ryN5p4wp5z#`(&0Vk%3k&yFMQn`(a{FY@+uV9w?(n9XnK$oyzxSIN zVT}=x9TB2_aK0#&J1(Vgt+VmIGz$iJ1A@E)-U7QoUl@vq{u>nH?^l>MSU_N~ugaakKlQd=~PW`+GcBz!n_0TBGic=wIK1QJ={c69TegpS9sh> zUqH!VJ*oY(VPI#6pg1irA^v@Z9?)-{fusxA^atrjx)c?zauWam002ovPDHLkV1jNQ B@IC+l literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/dc_jqz.png b/src/assets/img/shuju/fiveLayer/dc_jqz.png new file mode 100644 index 0000000000000000000000000000000000000000..6a7cd1eaffad202f4a075d0622ca83d7ed8c2eae GIT binary patch literal 608 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1Ig&jCImu0Z<# ze}@0782--$lk>rhMGUX!GQ69~@Ocu$*O?68rZaq-&G2n1!}sY7-)A%Yn8xsV2E&(W zAgQl27`{$r_%?&#`%H!}K=urGPH>UAA)d z#%ZuU0pBU(IvNFJ5{n=eIm>)pPy3dFygb_q(%SnW3QdMB@DSmB$YC-qQHazy9XW zyZ26KELpKDHc*^db<361bG0A!F61roy4R~(-MGp*%Z6=EN=eVQXPVRczbNm~UB1q5 zUH!^yE7c2S?9cK1t`bQt%4Sf$M~%g*Q4*}s}U7@fPEHVJkx?FV{=!PC{xWt~$( F696qx7*zlO literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/dc_jyz.png b/src/assets/img/shuju/fiveLayer/dc_jyz.png new file mode 100644 index 0000000000000000000000000000000000000000..d58fbb6ad25bb93e22f76de228f7dc5084174b5d GIT binary patch literal 608 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1Ig&jCImu0WdM zKSSuMP~$VkT316I_B$A#@zvYuW_`rZc(;q;Ay4B&?v{If%=dem9`v`^A7FOS*YvQr z`5}MvLw**Ae9ZQHnI7;pI{;MRV+vyXm>vXjea#Mfn*-TkDbs^K=7)UDL4rUMDCh$+ z1gHSWJqT0}4GDW2nYeSgBTzZXf;$2EQP8bt`V8> zaJJ-jpsxc;g8YIR7@1kwIJmfZ`9&qAWn>i;m9+GXOiV3pJbc3<;}i3WDk|$5n%X+L zdnQhqK5xm=Wh+;2+_rt^o_&W-o;rQ@;-xFsZ{E6n=h2hrFJHfV|LNOL=SeGkfoAXb zba4!kxEy-^xYMBo0fvW)UA%(QW+886b8a{VC~Jhx`Cc!@zn^jLu>(Nd+&6{k`=pR1I3wDw_Hg*SNl=#Lf#Uud%ddFjjNoqY}n?cl=N(S zra7(ui}D`bQaFeV{wqX6T`Z5GB1Ig&jCImu0WcB z;eTl8|FpFK4Gj?Vtfb^cS=sCI@^_V$pR20A7FNG0D|=g1{kEdweM!xSii!`#m7hzh z-j!B;D60l?KbBN}0xB-8_*h>3uDt34kWp6o9*jPgSH3T={7_c$p|tX2S=D$g8YIR7@1kwIJmfZ`9&qAWn>i;m9+GXOiV3pJbc3<;}i3WDk|$5n%X+LdnQhq zK5xm=Wh+;2+_rt^o_&W-o;rQ@;-xFsZ{E6n=h2hrFJHfV|LNOL=SeGkfoAXbba4!k zxEy-^xYMBo0fvW)UA%(QW+886b8a{VC~Jhx`Cc!@zn^jLu>(Nd+&6{k`=pR1I3wDw_Hg*SNl=#Lf#Uud%ddFjjNoqY}n?cl=N(Sra7(u zi}D`bQaFeV{wqX6T`Z5GB1Ig&jCImu0Z-f z2!)USB8pEDRfU@(5np#OwH?tZQg$>*(&8IA!|0B}-L>TPoBSg{qFszZ$F(Ut?&h!z2DQtF+}2W==tMLhY|!B9x8V63QC)Wypheh z;S`{(5jN+0y%hg`#<`ET?{0s(X7V!saLWbPJTE`*mRa$O^TUEHme{M+4c=Gt-13W; zUds6`&s+6e|8Cy8T+{vT>{n(eXg!fQ|9$1LL%p{&zVolY`Sb3*(-})v?1~K(XI9;E zCG}kGN4*PqOT6y&s#Z6ya?Y}0o0C$~v+bGYwEi#3dvuqt^IKQH^4d!ELK*vWJin_1 rma#fjYB5%6^USjIxpnrh<_|{aE~ia`9ZdUyUSaTb^>bP0l+XkKly&iY literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/dc_yqhjz.png b/src/assets/img/shuju/fiveLayer/dc_yqhjz.png new file mode 100644 index 0000000000000000000000000000000000000000..9a125cc7833723b06f91821333b3854a7e1c5c54 GIT binary patch literal 608 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1Ig&jCImu0Z<# ze}@07LjRvh`+v3J|Ne&mXBz(REct(=?Ejha|A#97AFBF)tor|nvi}FG{~xdTf3W8N z;R=xWiK_p{tNtIU{(rRM|Iy0-hs*yTtN4Go`u`E2`ilQYDnWt}bgc6K5r_y-Jy5pl z|4|?VC=1pIWPn7#iXpmy>Y*A@&4C+;tQa8(HVw{&Isj%eT>NO|O@*mCKyL?>1o;Is zFfy~Uad2_-@{3AJ%g8DyDrxB%nV4GIc=(1z#wX?#RaDkBG_`ef_e`8JecqC#%T})5 zxNZB+J^K!wJazi)#YEak7aXIw-ai>EG z0t^ooyLbhq%|hPD=G<@!P}T^W^Sxe*e?Q~g$J=+eKV36c{Fdjfdai#rZ(XkGes}gOGZeI*NSyz^^4Ou?TN>Z_*Wdhk z_ulD@B`bEt28uJQZn=_ruJ)teg}fzR_j*;U8&^4J*|5z?De2kvOmkZQ7v(*=%h&m> zt6zC-rFx-^{W+fBRRYUcohr2$tF(D$+4QaFeV{wqX6T`Z5GB1Ig&jCImu0WdM z|Nqcc|BYw<*J}9hFdxKl>;7*&_rJ@`|F)C<+s^!NIsL!Gr2lqP|2s_oZ#VhB%`~t$ zkeu@0dh&n!ssHVPjH&-^z{qY2hyfyjDuLt_kVc?NAOh;O1tK5=$OS3}Gk_$J4N(AM zgLOgGL&U*afKotXq2gfEAZ#EB(uHIQkPR{)H{x7ca1`k4fRZ4;UM>bvUJ(X)f=~M-??Ysp_8Xh zpS^hL%JrMKZr^$I%iM?9g;C(gE zEx&l_rJUdLyj9Qj@8+$`HQn#der1M&))R^I-&Y;Iy>M|b%;zjgI1udP%sl(9d@ u^Ser58LLyJ7Gsq*&n!EiTW9}j{$OQaFeV{wqX6T`Z5GB1Ig&jCImu0WdM zKLf+6P==Xl467O#<|lv{i%J;gmVp@aav5e8Ff7bqn4QZoFNlZZxj;r1!yF*W1+jsO=K#qZ5Cg=`0dXNBK=pHg2&f^pSw)akPqFI~BQ^VaPy%G<(0Ni(`ny<StD%D_j)P*{fu)TZ{OYibj{>t{^6Dju6bU5-Yv7@7w3ls zSuC+vs~fzp=DFn;FTIrWTb{S-x&Ga}b-AYd-Py0qP|$iJasKs768T;-f)!!{?Sq-WbR&1wB#l=tW^U+1^3 ze&w~5>V-1)=Xics2`poEs?=hv(&m|E=X2}qU(Fwk&RtHM1Us1agHng5tDnm{r-UW| D#_{a& literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/ep_lg.png b/src/assets/img/shuju/fiveLayer/ep_lg.png new file mode 100644 index 0000000000000000000000000000000000000000..f6f13343a3e3b0582f75af0ba766e64d95657abe GIT binary patch literal 557 zcmV+|0@D47P)Px$=Sf6CR5(wa(?Lj7Q5ePX|9OinA==fdwbY^#h45X27S*aE3L$cnMM5AbWH2*O zndUsn!ib10G-y$qsBKUXVKYHQ6tsvIErJN5ZHAPdm|>im2FIa!tH-v?- zIG^gr>;ip3(M`qUU+c{+eAh~Yo=fc}(sN7>(Fr_NNDllz^eVN7B~2HU})#7`F8Q|yuR>0!(yFb7LlabzO5V8%dgRU7muBoB*ga_M>Glb}P` z?aR;*W(pWoNUoPl&!w(`2Fs8+qVD8T2|5i70UNN-)IhqZkR7RlW&7( literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/ep_lssd.png b/src/assets/img/shuju/fiveLayer/ep_lssd.png new file mode 100644 index 0000000000000000000000000000000000000000..1711df8ebd0eecbf65990ae5490112a3262e8b07 GIT binary patch literal 510 zcmVPx$xJg7oR5(wql+8=jK^VtB&v=T}gU9;)HV8#KSnO<(ULry8q+O$K`3IB{2$FP2 z5du+Ehz`sphz>cgD>9oV zzf=wAu`|Hk182xpl*tbEt-ysUPOlYx0w}5G7Kh!9w5@Q!+8j9yYZXO3zP4tTxcfG7A^9rQ5*)b^FZx>CS}-f-KXVR8n@`lOvSvPNXU*U z`mmm2@nrL$wutEzG$rWO7&nz*=Of(h00g;L2bBB;L9tsP1!g$HJxH(%5$=}9P6Oi& zgB0y5fn+$wP5uL@RHF#j@{Qis0>5s=xW@_heo*Gg-T|F$K#~0fbcQJfH9!Z*hN9th zuL|^+&T6hgsL?71?bo)WP31=&(C4QAqoaU-0FXhMuV85sT>t<807*qoM6N<$f?ovU A0RR91 literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/ep_mrxycs.png b/src/assets/img/shuju/fiveLayer/ep_mrxycs.png new file mode 100644 index 0000000000000000000000000000000000000000..66691dbfa92df58c66913f47071179679510d4bf GIT binary patch literal 608 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1Ig&jCImu0Z-f z!~g%G|IeiTzuNHse#8GW4gW8e{J&B5|8DvJ+m-*XRsFwN{r`5^|2x(HuUGuPQS<*+ z1xWlx6-eqv_5Yg{|F2j6zghnO29Qw=5(g>+irfIBn?R{bkO+tbst1||CV{d*jX)Bl z5-5VC9?k|Dh+xAMposvDg^GZ!K$Ar_87`In#aI#O?SPUXzhDMNW>z*1E^c0aQAueT zSp`KUEj=R>Q%f5U->}H|#Jr-4%DRT8wvO(eiBqP}Te5W7%GDdUZQr?P-=UMIPM^Ja z>B{w+w{G8g^yK-=*YDnc`u5X#(h6Uo+50_R977~7hn_#~bSOc9;h|y|ub{M9$Q#+5 z8%_br8ewz3*Guv5XPo@r z>7|_C^1M~g_3!4b%QfBa&VFTvg4Pp>^WRqmXPV4`oyhnHWI=^-GE3d6oFO;!A$Md^N rU>U1Zr50nAHqR_OpIc}DYW`q!?sD2B*uk_P=oJP}S3j3^P6QaFeV{wqX6T`Z5GB1Ig&jCImu0Z-f z2!)k+r5{N(wAhHlHTnelb zMGa6T*nEf}vMvZ4;sz)iY#N*mvJrwV7yeiS^maf=kY6wZBQq--2NyRlzo?|NjI4s9 zl9ry4iK(THhi_P9d}3ZvMP*$>Q(H%O&%`Oy=Pg;fY~|{W+qUoAv+vN!Q>V{fymaOI z&0DwcJbLo{0Tq`G;FBxaN8JdAH1pUz{HnWU<6vt#0tXn&*~Zy!2Ae zZ+YIT=lXZ^*5#V+cW1vcLqY3_#QEHzFI(Ip366|2w5A+Iyr>mdKI;Vst01!6{;Q#;t literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/ep_wb.png b/src/assets/img/shuju/fiveLayer/ep_wb.png new file mode 100644 index 0000000000000000000000000000000000000000..4e9dc1b169fbe70dee79d1530e647e3386f61290 GIT binary patch literal 608 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1Ig&jCImu0WcB z;eTl8|1{(Op<4eP9RB+n|98{-?`Qo#6ewc&KgjsMkN*E4z5o8E{{syE`|AA6b@rijw6_s@jO>G_BJrk!)pSNV`vX!ehZri?d&%Q$^ zPn|w{@zRy+H*ej(^XSR*m#^Qw|Mcyr^Q0BNK(qIIx;TbNTn;^d-04t)0K-GYE?z-t zvyeBkIX9dFlr_TUe6N?{-_JPr@%G*APuEOd<{xgk;F{;<=iM?ZesO+Ski`;vwYtIk zYMxtu@zP5~ie$%Q`P{sa_~! we~#yOmB2Dqr%ElxDs7%wc0RYx{?+`!=-lPBNw9-yKPYi{y85}Sb4q9e0G6~9N&o-= literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/ep_xx.png b/src/assets/img/shuju/fiveLayer/ep_xx.png new file mode 100644 index 0000000000000000000000000000000000000000..8dd8c4e06e8ffee3a24295fe9ffaceeef1ec32b4 GIT binary patch literal 666 zcmV;L0%iS)P)Px%R7pfZR5(wKlS@ccaTLaX-@W65!d{!e2rMgVRg1{fvPEIg16+v|Z6c#Zh+34E zi-IBwoIw(LnTSeM6hX8LYEjMvL0Ah51nFt?lom$n+Q z7wfT8h#fNS)|Tpgx<1ptQiW*3uF9yMj2Rc}N>%eeut`uXZnuES^db}8^~KsZ8%$=V zmS@~BqiUvPgX{GrIuPhVek?(uJp8)N8u(YESi;s|^aTNl$1<9HG2|EveK-e{1zKH+ z6ph;k;HF^N1Ykf8hiW(Kp`uT1y&Rs0LXv!Q*&?yY;DO`OXD;sm-=J8=9mLY~&XdMs zH9xVnj!SPKdPadOdVnQ}mr0-Ui1-5hKr~=n2HbRz9LlGF=43PX_b3;Ds-P&xr+LKX zC-4n%45MAp>l+Pn@G;H+MP_WD0>U^eqsxPQ7Y0r24*@VJXf$Xu=$DAeFoVOuItR8* z1&#Oo7I+P;0tzQ=d=#8CXaN?aTgwFM3@piII863AZmM2jI3KSmp|Y)zd%`m*q*1M?gXF@>qnOSxG(v zLxNg^Rv>RyYdIc^Mj}*W>;k&oB=@`sUsF2j2(9_-bs`KWeL4hNGtH>WHBOI;tSkr5 z_rq1FNSV?3`5`D8w-ti^)OH1b402Oq@6D)@=mh3XJ8URYG-11C+@I~b z8Na*6OnEX6Di*gZ5Y8k#?iqkV+|PI(;2OO83x=}$Dl{#3#{d8T07*qoM6N<$g5|0v A&j0`b literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/ep_yy.png b/src/assets/img/shuju/fiveLayer/ep_yy.png new file mode 100644 index 0000000000000000000000000000000000000000..db68b4a9075f31bfb57d3d93b2f7737960812190 GIT binary patch literal 662 zcmV;H0%`q;P)Px%P)S5VR5(wK(@khyRTRbX-@f<7DpJ2DLepTiDmrTN5Q`u>P%3BzN2MrE#EJtc zf>Nt?pin6mM8twoYbk9J6-5wdf{q*&n&_Ykg`&+%#LwcO_>p(dmYbv{eMyLCcGueH zf7jmUoG`GabYBX2fAYzQiB|{xmA+%KF|GSf${pvm;LTwZJO2;t0;p&7Lt@*~O?hm+ z$wya%MH17--pBTpij((7Og!HDZGBI7V^Npu96x;_{fzFdMV_1&;;T^hgz9W6R}=e^ zyIN*wq9bnxV`$uHuJvD+$+w{l;#Zb-Si$UCV%uf@rt{D_ju9ijRd zBZJ91nrowHY!fD1vtmQxYYgL?j%G_={WE?~xjV!->OoM*Ed!wH@ah^JFoWlDFgZoOUWrVe!YJ+? z0L_K|0pHBndNiI!aUJSa# zKWk^L*;CjS^5A9G9Qez>f8sYhgLg57kAn6NK7?DAwARtw&{uzn4eg(2bsiYf{|RUD zG;x4jyJ~BV{xuy#JBr*&9P7wW8-7`o=x}nP(max!qdts#mK*lbqI$W*P@`$6_J?fa zpP$iNm?ggtQ71Ry$~n-K?u{W&4aEH$moC!Igxp!gk>HBK)>7FV)4C6){A{(?jeQGu wX-R3yC!%NcZDQ+!n=1fYy)6Gc)J1&zAJ_lm>ax&%?f?J)07*qoM6N<$f&%bHy8r+H literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/event_tdnd.png b/src/assets/img/shuju/fiveLayer/event_tdnd.png new file mode 100644 index 0000000000000000000000000000000000000000..c9766c38c32328e78f6567e74a8c762880918b06 GIT binary patch literal 526 zcmV+p0`dKcP)Px$$Vo&&R5(wqlsjltK@^6+e>YKKW1*c`i9sz?6oawI-3Wq}u@&vKvDmxu1%enX zOb7@eqL~#71q%x+J1ZsNz40xIohWv`ihzh<5H|bEU9y^DvztYyo0)UI`R2@F#D5y< zloJKt0ydW??UBm}N#Ufn80Ko+EBle{uWCY0WkEqu|TH$!u=8KND+z-6#rv2JBw) zI_8VT#Hwy?J~*!L#o!UcXg%KCOUpX2JkZ}0W)b6YsvSqHpDY{$GYY!z&2b&$-p4D{Nt<7YR8l{I?uRSutYmqHH|eK1&;&gmJQN8o2p$D@-UQ^G}T9jWoCboY1%1Hk7Lh;NfIfHpA1wv^4UzN1iFwgj QZvX%Q07*qoM6N<$f)Bam{r~^~ literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/gr_czw.png b/src/assets/img/shuju/fiveLayer/gr_czw.png new file mode 100644 index 0000000000000000000000000000000000000000..eba44c334336dc766f78b77aa96ad120be7e9c84 GIT binary patch literal 713 zcmV;)0yh1LP)Px%gGod|R5(wSlTAnzVHn5%&pR7i`;LeoGpLp2Af*>gB zP^S)Abnx6kywybmZ$$^gLqXoe4E&f)3JWyU^|N-@aoU~tiFb8vb9aPZ7?}6@_|5-$ z=6NW!(DagsS{cY<^9TUb(sC~ofwyc(C7kC3oX*D)um`}WnB}(XI7%g)?cjV8fHl*0 zD+=x!GzQ>!p-sO_%Z(5r(4biW`~MB#G1HDW7uu2w&TAsH?Ew9dmV0Oy5E5W<-cZ?J zIx!0)Mnb&;(UJcJ?W`c|zGT|2rJW(AmCSn&U=W}=2(E*|6)>75M=GgiEWHbe0X6{e z04x7`S?$+FW*F;BO?Iq0KCl1O%F4;|il56qHGJO)1u+YVNalsCn!1smJJ!k(?gHa% zPAdZ>FaU^0(wZ0vFHMUHjKQ+H@r&MS{o|}((Mci`)~7Dhb{`fiVg`f(nTbj-nyFOT zUo2QUNR zAP7UnAOcwNQ`3$=NiRD2waKwe+a>;Xc<;KD9uwbJj9~!`0q{yTn}K_#wXY|g@P6mC zZ#H+QEtrMqqtt@a3+6@;)V7m_G5YWPH$2cZ{?2c>3!i0kqlDDvy3>WQ8H($ZdUr~5a2J>^BmBciL)ntT%qDoo+E v#)hNFzxTl$PO00000NkvXXu0mjf_mMtr literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/ps_jjz.png b/src/assets/img/shuju/fiveLayer/ps_jjz.png new file mode 100644 index 0000000000000000000000000000000000000000..61a8979816e3e75c3c4b4bbf17733fa3c976204e GIT binary patch literal 713 zcmV;)0yh1LP)Px%gGod|R5(wKlV50-Wf;bP*YkdJYD~X%5-7oH7Ijny(FjBj6opjiXpF)WY0`m+ zP`vxT%>#wi<|iSd;QWhh5fw!coe6f-Q6T2Q6b7TR7WT(&#l-FV-sh5cn`8U7n$Ow$ zT=)Cqy6)$`Mcqle$B)^1Q|7BmfAK`U{$Jl(ETrX$3qa@NJK-}Y`kD_v32XtBmM1<3 z+UtL^{mIGx=KZU|1Xfy}{1oW;pW@4vzT&%cx>YLu(+ZCL{l(D*_i6g?%Ou(G{Ka<) z;i#(`SA(1F*oWDcYn8sD(w@oJiT(_DZoYmL@m}Sl;x(l`6R#2ZAr}g2*pyM*9v!#h z@NIB5>=1qiB0+Bu{Uz{hz4KU2o>5oV_$v;&nTuI)OCjoe!)D;eSWR|?hU^~jw@pc6 z07#a#KBqK!|)C#eLvU%c-m@z|97SmwAt)l0z!O92t&kd z6CoLM77qwg(3lm=vMvdaMC+7~+(x_zw9d!))pC!l(?D^BXiGt| z1~X{@)u!@dIdlo$7W@|F?mU{|Mu`3(23rcfv#(n3Xno^M(}S5cM=|Y&OAi~fv+Jgl zNyJ~q@5{Of+(mq0lMnM-f|r(oV#4zw<2uj++;FY1M}^w&z_{fjvd#ict40gvX^T#y zz4>Yslzg3${jtc=)jXP#@D4N8DU#$Wuw#X0d&r577qZY$OPnclW#0bd9-RZKf;*m@ zrx$>Yv!GIGa!Zs)>g+xQ)-JmHMbU=|8Z>NJ7A>evT|M{rIfidm+ipa@cjcAp1P7IN vPn^fvJNw)?AF^e~%no1F3hR+a6x@0Q@^vppc3;n$00000NkvXXu0mjf+C5=K literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/ps_lyy.png b/src/assets/img/shuju/fiveLayer/ps_lyy.png new file mode 100644 index 0000000000000000000000000000000000000000..296aff25cf50c40f31e1377fa56a6ef67d2a6b42 GIT binary patch literal 662 zcmV;H0%`q;P)Px%P)S5VR5(wKlwWAhQ5eTR-}7#ZH2-eYq{a|eT*#7lv!W@cTxpRTnPhKLG{Y_^ zl9god`!bBQEg@2Jr%0PCrExJzEq^Efb1})g-+A==ZPWW_YtG$yzR&rb=X;)Wj>sF; zNjqv{gTd|Igiht_6U~(^R3+^qq9H4m>`7?v|G@r%;wif!*ix`aboVrB`(!X-rm8g8 zfclA&O z=nKUF%8TH!!Cc^35TiC0@Co<^Gz0BGEFa{cHV5>pm}yfpvIUtD>f#@nS%7(?DGj?D!0fQzE$>;!H0cT_wB4Mx`SeFADE%~*? z3o{l26{E5DCXUEB3(Op+ySX44oslKSP}D`wLBUqR2QLmQv<6QF2jnq7VlC`yE+{5S zz0qPL7qjD!CspG334ArNU&bZi9dOe^V`8&lNdZX40uv8_@^I&v*ccce!+T|7pNtex zI;k~t%vL~yIqERF<++37b5=!H!wtM+Tk$YMfg_x+9q+Ka0?)A$QS3c|714@C<&T}w zc_0J46vPY`0W%^{P1+U)7PT~c{063E1>OSTFVG20FRPx%RY^oaR5(wKlUs<*Q5431-#&9R&5Y}d8mV!OCmv){;(;ia@+6TL8I4I& zWJ;3DIj&7J5+WsUiYHG>ct9z+%RQMhhME8V^gj)qIWyDPZ+m@f|Ms`m-b<9NLN4qB zFR^{Crinx4`e1vN3WZ!a4Q}`svyN3a#m)Z%`v>aCh0DS#%MVGqP}LaM4h55q3i)tR zc-5fE*177YxIWd>{9h-Tgou?*JpX$}KTa?`1U*gz5_d?vH-T>%7#)L}1@ls^dZX2u zW45hJhzY%b=aw658o8xHo>^G;ib8O$BJ-^<*TkC{@i<1k1fuX9qpQI9a_13`RY#r~ zvK|yUiR)rUcY$%h!-y9J^a1#Sy%Q-9WXeI77xe*E1y^@EwBWQ~%6B^+&Prc_PsZDY z&I1n|Q)uc^2N3m+Ufc%+I+!@N%hX!Dt58^%0)TgxcgZ>nJi|Uhz@SZ-nU)upfr_SI z08fCaz@*+X-dNrvbQCjcfYQo9R+~c1$4H^rGld<-tAV$ccgw}n?gx1r5hv1t^i}&g zs)`=|GZXeYrXSO1yLvcYnbmjTv*oR_&H%5mu1E;H!Z58LC{%c2?9pwYF1^{&OBM7U z_-1)au#Ovs4_R8bJ*Gl5fR@R=5PP^Dviex!s5QMHvDZ{&DbS-}}0qa4tUd5VhvX$mm12ncXg+vLyBjc{5fUFrwdJ=z9>th=^al(II0nxrRPO))002ovPDHLkV1l<8 BF}VN$ literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/ps_wss.png b/src/assets/img/shuju/fiveLayer/ps_wss.png new file mode 100644 index 0000000000000000000000000000000000000000..553ee6ae72d84872b1f774eb7c88cb4c72527108 GIT binary patch literal 668 zcmV;N0%QG&P)Px%R!KxbR5(wKlTApJVHAa*`+cJZVt<>!2rSF2O)Vk`!WM-=8MKlp+C)W*kf6{R z$3;OkCPYL+Rwkhm6-5y3f?Bl-!h)PJLHafNl^`L1zW2m8j-oSD_U_($&U@Z-F83N) zC)uQvCUzk1Rkql2Ipf%2?FH?9Tk7j?I;h=y;h=hsi5UWg> z^~beQj$6R;41drWN7kOTN0y3f1CD1Q;EYlqwm7lb#KS=J`5tf6kjExD?gGoQokzx5 zV*QO;Cy(B=kVl#4cnT~9UPQ*JnJC~h@ZCgIMmykV3pt}^me8*vii<~SP4~-aA9I{9 zG=2bIWi*)R6!apZKDfX*ZBQk#eU=c$89cgil;SZ&zyY8E7&0R!(IFV{#041wjsok= z*fv{e((@Zc5~Bhr&&2p(MqJ_|urNDXj*vuG7|D#0G+8tPdx4K;G)Z&<&ppQpdB}y) zM0Ji(P(+D8Ml+&L&=D!3Eg0n|#y5lG64!wDX54YY40eZ;ksHlt1p$wNvhe3%f}MVZ zPr$Gl$0XW-k~yP|iN%GM-nCkZo``WjfG;x~-3ULxXP-aDNZ=FRx8`ehx9@Yx1r!86 zffvxqr2VNLT?WPlDVv<9RltI@(5t9c`o=((-QU2x8MSvf>hb6T=I2E7sIp{SyUg)m z&h0i560v+dgTvO}q$?7&8A3Q@`A%4O`PL&-d-(_O@CXVOw|b!f0000Px%Pf0{UR5(wKlTAoeVHky<^WB*Y!u~da5m;8#suq!yR*S-*3|dJPZK9$@NKmMw zE()wMAtDm8vJjQ1D1vAg)WXz7AlAYHLHafNl@@|J-tUdMYS@focX!`&zVn@P?tMkZ zW1ZD!!S;YXR8jrKOnkO?O$V$qaRWFuZFW^f$@2dZ`zvH!iF+7j*@vuMMfHd05|bIC zD{%)nFe_Qy($?hBG#>H0s|pD5+Eza>bw<`*u^u1vO%9$TSBp|ZSbPa)NwDo{Ohrjq zSIuVdcQIB@@&_=TQ1OMQvKKX*kbfBgq4EgWfmt!mo)B6e&bL zQMm!Auv2_m^<`1$+lp zfZYaq!K!e0Om!HAV7oIM={)Azz~_M*MBx#j0vJR}VAhQ2$J=F4y7rU6MxwS!GqIdT!qMNLABfYK-2^@&-N%~{`+;@YLgT?IV&O9&Ke{~TABPB6Q v%)&b^>#V*GRys+rS%~SmpLsn95U>9L_VWG#1YfLi00000NkvXXu0mjfnxQ4X literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/pu_jgzsbm.png b/src/assets/img/shuju/fiveLayer/pu_jgzsbm.png new file mode 100644 index 0000000000000000000000000000000000000000..36bb695e1eba910211f26de9cc85ea256b2b2b35 GIT binary patch literal 564 zcmV-40?Yl0P)Px$?ny*JR5(walTV0^Q5eR5&qobYvSVdEvA{G_y62-Turd-&$!rW6sj0c&WtRSq zQYQ1=BpI4f7Hq^;QIhUAC5f_-g@uxmEt=>)`tHoV-8<$Fb5`e^_q@OJKF@oOSYV`? z2P}3(RX$b4jZ)C(h0f;tnlG46c_-!>PyxCPPf9^O%K`1ej3z;yW0?;N29uz$Bxtna zbt}anum&-W*$fmcuFLEOHVDRlnVZA0zSe=`uiSp3TR$4o%9)1^R~EZ5j~V((LHF`` zIrCn_gyH*&h~AnPhGM;In4M;>OFL7Hb*ZVMabTdS2~UBK zm`#Z7f)sdD47%GY4bCP(xxuxOR(uC>WQlJ6OoH0ydi2c^&sF6&uv%h|Vb!7_^C5}V zF}I?np3+}&!TVy+#>GIFWga&f-9Mkqe*sMjGEC(BfmZ23?3-Is3uvt3LlXD@Th~nA z-zEiZRqdaNKFpS7fo76MlvaFu_Sb(|7RaPx%bV)=(R5(wKlV50#VHn1L*Ym#L8q41kH7N{n#DRUYVp|bq-?Sr%oCrD4QpB(W ziex3p$}o~GAyQ*U%6#O&lyHDrE&t{3axl%l?|p8)>$B$DH22waUC(oMUHARmBCnF^ z)B#{M*!8Z;j-&bfzs?#?l-*06F=NXRCY|i6xLNl2nx+Jmg-Wvpb3~TX0!rlQwJh#L8OGW4ana}Snzq6 zqYH5~AGi%cCevpwh|kMMIufl>COU`<6QQ%nj7CK5upXTPGQdkv05%txG$>Twxn@q} ze0QGRexPs|_C`{jnOy`X=123QOr>{IH4^P(ZMPXmr1&q5EHk#MG+lEVEEUs=cYE}T gaX;F6Px%!bwCyR5(wKlU;~bRTPGwckeUbOnjqhL=#3}nbXt+brDGrc2OAg16_#}-9$zg zAwgkUUKALT5D^JYWg;q3Q3TOlP*+_All?FgDAMmV<5)7~=lpoidgFXK{Dr=?IMJFMe8cwUcFaaOzuLU?+b#bGwg8$M zzy94Kv(a99En@D_^2?7t^j|R5KRz`%__pw-^A$TvQg`#M=E^T0nHM_y$KaZonG`Gf zzBx93M}Lm3y-r2fNF7MwbdZ$wik`fsVG^E*8~>8h}?bW9PC z_4bW^qSn~8H@nDR)Wwol32wK!&7_ZW>5;07A6yYpl(%-L;{B-7l~n{17$HnEX8Uw% zqW?xz9IipR^y;e6=fD*>zOow|l*$R}yPUmY38-0K)I43B-fgqV zVyJ2qFBNmu@4#fh)&%>2!#Hh&DwNpi&^kzWEdd$5V3h||vdY0&Y7`G+Zw1D%w&>}_HQaFeV{wqX6T`Z5GB1Ig=K($;u0Z<# ze}@129sWNv{{Kqr^=tLFZ&m)kH~8{O>+5UHA1`%(Jl6d5TK(rai7ziSzP!}_`dZ`L zOWjYew7$I1`t(8zr0j#ykJlPsU+a8+srlu#_P5tsUqA@R*7^DhNCMeF29VVL{8H=l zD{T;ZtMdg&zSREoQUhcH2x)(Pqxtz2P=VHm=Q>|NDm8&pK|=5+n#w2385?zSah6*PVO#70|1mB|(0{3`{IsJiL4Y5|T=)>RP(`#+J6u z{t0Pm8Ciuz#igay-93{REm^*9-Ig7D4;?;y^w{x}C(oU`a`n#Ld-oqbe)8}eZf4V?J`#oJ8LnI_a53({fF)%P6NHi}iFBdo4cKQE)cUG4j&4=P%Y@K8# zVX^y9gviO%RVKV f%3s?g_<;Arbz`^bD<@9_I*q~8)z4*}Q$iB}2r3#Y literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/shequjiaozheng.png b/src/assets/img/shuju/fiveLayer/shequjiaozheng.png index 469937b07caf6fd941ebf25073f307c94aee3ddf..f610ffd8d51d87abc10f0c380daf90586900ff44 100644 GIT binary patch literal 501 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1IglL0;sQ<}thjGbaaX_Uu72fR!>W4*KvZ$hpzANLO?;NIdCa7hK})`%Rs+4l?3?(Gcd7m@$m8q zNJuKFs%z=$8(Z2s`zNGjWEB<_msWT8OkT8P`MNDT_8vNX^w{x}=dN76bNAl;M~|O8 zd;aF#$DhCc{Qc)SmdKI;Vst0P8B-RsaA1 literal 305 zcmV-10nYx3P)Px#>q$gGR47w*&96%XaTv$(_vbs^7!EB)4V$1~*qOv)vWg5W2J1jfv*=y32>u8r zu~@Yj6#NhT3(he?(3?SxVla4c>>g3Pg9|?C`S85>JmPPf+m8#bR5~>y#&L32u3xaL z^yjP$c|reHu$bl4vC`dZ+!T@De~_5T5Jo%PZ=B_5cJsbg9;?0qqd7|LFg%#rDKs_x zXjSM^LI%C}czFKxc=GEPO>DhX$1BM)vX-GWfdhL&oRbW$!=vd?b3t?kYUOW=OOnEp zyde4%s{MmN>d5n-H&D7RTpeu0U`P;S_FPx$?@2^KR5(walRIb>Q51&1e^NvP!A`@@ZXL8xLj+M2QmB=RC;>5z4-5!_1k}>q zGrNkQNJK=85(NuwL|Z{YM6|FF1q-pT(99}gYa|fo$m}}VWZBJPE>qk)_nz;Z|2#yS zRmDaVd?)b5nZHrsLfr0c`d_UszhXlH{v7lQ*aH4EB-;1ipcvZ)emNu>sA5MP#zJg+ zN6>d{Z31Hn-YYccuu=Fn!F5Nw!3&_NF1Xo;{m6h-tS5)fE=Y?ho&{Z6&SU+tMsnEw zbU%ab6+R96CH@T8auj1{QYoO9kX(Vloupd?74ZJdfurF(_ONbKngu@rIsh7|fvVVq z`J~)so&y=JFsQt=Ma&-I;!PI<)&+gwz1V*kSMoE71jd zA7YzTpR-^DeACK6wHd4^rgR(B>-e{ofCAK=;OqVZ(1^yL3h;on00000NkvXXu0mjf DILrTq literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/sr_gc.png b/src/assets/img/shuju/fiveLayer/sr_gc.png new file mode 100644 index 0000000000000000000000000000000000000000..c5a00bb7ee2ef629442f4ad9bc8f5c55efe118b9 GIT binary patch literal 597 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1IgZvj3bu0Y!O zjIY(vK+C;8Ci}fD4*8fL_BJ`>V|vibV!w~+es8nGz7_|)%@6sS9RLaf89rtQfTXwC z0bjF&zNQC#%s|N345;ORkNH7w(*r={3shhZ5j^N)3S@&6Ll{6cK4yn}fr>%8fQli8 zfNTU=0aoT?4zvPj2*_lh0-zSKMIiHiKn?(z0I~~gHJA&Qf@p^b!W;&c1(}0_v@SZU z0DT@<666=mz$GTFV`OY*=iuVw=N}jp5*iU16&;tHlA4y8S5Q(~Q(M>2*wozG*3s8L zVcN{ubLY)pykg~=wHr5Y+kNQpkz*&$U$}nb=B;~AU%Y(%{@eE-KNU9IP6Qgh!PCVt zMB;Mj`KNq`90XV%9PExREY}oifAp^E{ePnzea$D&j;s8BYBrm>Vp8)gR;M{RU*~l_ zx#bl1-@Vv1^Nifpvr99Uom>*!CpnSv``aA$O*s$0vhcewK9H1~+rZ;}`L@_Zc@Nq3 zf^)rGVwL14B$&MjS@urQvY}se&ZjF{7h_^KrA-NL+?7A4wrE#>`>oRpl+_ihn_o>* y`Re-Wm{8$ccg4a&_xL-VN3>q>h$_B4DK2%;^s!Z)@ok{n89ZJ6T-G@yGywpykp0R4 literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/sr_ggld.png b/src/assets/img/shuju/fiveLayer/sr_ggld.png new file mode 100644 index 0000000000000000000000000000000000000000..d620733a53295311ccf065b738bcb24472e4c5ff GIT binary patch literal 567 zcmV-70?7S|P)Px$@kvBMR5(walV6BTaTLct-zzO!^0IU9raW&vU|S`kJS|5YVyV&}j~J{LIAX@Q z@7U21^!+HlRx&PF11tfXfbAGJB=#7rmofLd#;yLlR8rvABE9S8Soi{SpuAb|qv{M#01Z zU@!qyLnaNbVodlYuBR6(d9EQQQrkQZ1$TIuB+qkFViH&@IMoC)xDYtbH-I8Un1SG6 z;CQs0{Di^0jG3X3~r0 zkU2pywFOUO_$1f}>@+2EybT-+O%(~wF002ovPDHLk FV1lLI`y&7V literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/sr_gy.png b/src/assets/img/shuju/fiveLayer/sr_gy.png new file mode 100644 index 0000000000000000000000000000000000000000..4ea25b07fb1527b981d8291f2cb40fc4b530d099 GIT binary patch literal 570 zcmV-A0>%A_P)Px$^hrcPR5(walTS#LK^Vq=&$kClh;DW2EOn^FAd+3_P@O8G5F#)AA!FGwh3eQ} zgCGe*KPw9jI@BfV8WdFfZ3aP6&>=c>2qK8C8G`x5x4Fx@ri;#L-kEuS^FGhaD;5~p z*xeF2%-87*H(uxUZK1R2y8gGB9rkvK=fEpq3-B}v+Ou@fkat881I3`$j$t3N2uVbSe46$G*unrjgli}7xUOy_pwox~~J)y~}v|Q{nz}3ZWEFU&q z#U9;H=h@i11!KT3M|74w>KOKEivf#7=9-LWph==1XsKQxI+KDPrg1Lzq{T7JK8e;c zC>OgA7&P>jf`%%I*%4ot>8->P2Z{wfn$5`reTLPMI5h_(bFtW?3zfu<*kgvHmDsSq z6!f?Z8u4+=ZJ;d)dN&6ITuOq@R}yov$AKeNX)|n1PU_8UMN^p!Z7=frSZj7!n&50P z=yFX(qlWGpkDkeVF>FZv#tb^*eW{>(b1M?(l7do$%Oe;2E^xTPYyM7xn(L+g1YRPh zF)M*xz={T-&q+{AJ*d%FnzwKGR0>+Z80d=NNzIF;rq7ev5F{AKOgJLK7)YCTZ+%Ji zpo74JCF}Z^@F5A>tl2*60yZrZ1g1X)-ATJ1^L?41CY!Z?0R4?`Tzg` literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/sr_jzz.png b/src/assets/img/shuju/fiveLayer/sr_jzz.png new file mode 100644 index 0000000000000000000000000000000000000000..7b1cbd2ee3c719ae5c927269c01287f6fedf0ab3 GIT binary patch literal 565 zcmV-50?Pe~P)Px$?@2^KR5(walRIb>Q51&1e^NvP!A`@@ZXL8xLj+M2QmB=RC;>5z4-5!_1k}>q zGrNkQNJK=85(NuwL|Z{YM6|FF1q-pT(99}gYa|fo$m}}VWZBJPE>qk)_nz;Z|2#yS zRmDaVd?)b5nZHrsLfr0c`d_UszhXlH{v7lQ*aH4EB-;1ipcvZ)emNu>sA5MP#zJg+ zN6>d{Z31Hn-YYccuu=Fn!F5Nw!3&_NF1Xo;{m6h-tS5)fE=Y?ho&{Z6&SU+tMsnEw zbU%ab6+R96CH@T8auj1{QYoO9kX(Vloupd?74ZJdfurF(_ONbKngu@rIsh7|fvVVq z`J~)so&y=JFsQt=Ma&-I;!PI<)&+gwz1V*kSMoE71jd zA7YzTpR-^DeACK6wHd4^rgR(B>-e{ofCAK=;OqVZ(1^yL3h;on00000NkvXXu0mjf DILrTq literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/sr_rfqck.png b/src/assets/img/shuju/fiveLayer/sr_rfqck.png new file mode 100644 index 0000000000000000000000000000000000000000..5a3bb9434e56143d9b9b6ef334bbd5b91eea34d1 GIT binary patch literal 597 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1IgZvj3bu0Xn> z;aN$^=fdhYB~|ZAt3Fgzd?>5_SYH0VqT+o?#fQ?$Pi2+wf!vac_drHj<%iOW59L)K zODjGC$+C)%rByINh*af=vdWJjEkH&UP&-%+kgNiVyoZnwDWGh51yJQjAXy4l3>E=u z2Z@)0tOK*FKqSP>GN9EEHqdIYW58UH0+0znm%~Yr8^Bzsb}$Eak7aXIw- zQ@%qE0xS;>c1IVMYl^f#dRO)Szfq39=96c~RenD;o6TG?sd*Nw)0~{I^SYkga*F%! zUhJBAM(*m_r5VdkE(z|FoXGh7Z4UdUoQGdo_+1zuNXpG^;PJkETWq4dhwOU6xn3@@ zO7asD%wB{ndnahw&@VdY(-p0YF|nJ{rUWWbCPuO_K{b$xYA ssPL`3Vqu|s{GHAtS}%A+72lo|mpW+r*s9L>Hqh-1p00i_>zopr01n77zW@LL literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/sr_tyc.png b/src/assets/img/shuju/fiveLayer/sr_tyc.png new file mode 100644 index 0000000000000000000000000000000000000000..c97264045a523ce92e2bce4745bca2c133515ad4 GIT binary patch literal 560 zcmV-00?+-4P)Px$>PbXFR5(walR=10Q5eU6-?bQ~WN}aCo~v0;EHI4{Q5IMs(Ui=_kSR4~3QG*5 zlu0DX(2TNRBesf?#KJ<9g)A(Td+&JXW@R+xy-)YKckXz-H!ts7oqNvt|Gw}4o%;zb zBEpP#u)T(Ut-`Hd(r>NqX8Y3YFvjcvUI@Ha*aSSYxV`@kn#JF#$Yg-)PcVlS8MRcl zwgn~htX8U{0xK1n2VF0)1@xvOyMSI`N?3L~VD@_fj0n3!qPYcYG3E?#WvPt$<)Hxg zAX_JxJqpvnPldsHk7CSeU=nyG=v5F^qziNc=qnS*pr!IC*USkVQ`oQ2Uk62)F@bA> zoD8VkC`hmBOiiK)?ly8!v=0{xrzZMW6#A>61M9ae+HE z7+8aQ*9f|3apxC-W z!a87E)(%DAThjZD6`ixVtikn&@$Z2gY4e)DEUvo|P?w1SxVEcv>ih+Heb-OM^gX1n*4^^*m68Y-sm2DX9b{m_rH=JMpFPA;fKz yY|a#h1U7U6$~6-bVeV#AFWGB%5DHx&J%0cp^sSG~q$K440000=G`P)Px$^GQTOR5(walu>BSQ5?rV->Zz3yz%5s{r`6lSXLs+1D=p*C3`WlQmd^@-FpjT zcF!`JBpGeW125uLQIdF&M5%kXBg)=OjBY5Vk>anuv@TBFuLp)H`ia*w+ir0znk0oHC2^X%=t9t(qb7C zpG8MHuY1Y7ko8`{81TcUeYQr0tosDRzza%TA%!tbzyKnem!LfkdXU(~tfy>_OB}$o z&Vq_r_W~n8PaJfu5?IXmDx#-i8xEy|9+qQH0=_0I#1A&ymSnS;@g z9wqif)+Y?NN@8j0O_W?b)t}uS*0q3D*7rAQ{d$ElQJ+00000NkvXX Hu0mjfd{F~T literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/sr_yjy.png b/src/assets/img/shuju/fiveLayer/sr_yjy.png new file mode 100644 index 0000000000000000000000000000000000000000..5609cfc7c900ea80706c352ff781e10fb4940d21 GIT binary patch literal 569 zcmV-90>=G`P)Px$^GQTOR5(wa)IVqxK^(>L@0%vNo5M~k>!5`iB8Z}3p;juQ1jIB(F}XPc2Gr8O z5d?!oMD7wL5iGP3Z3P7p(ZWI$EX2Y>5JBv67YWEdx#aG+oJo#kt7T?>pP4tavto&- zQe;3O?6LVSvSJeXvDDaVyB6!5F0nVDSHN3fJMbcnKD1(}Tx6euM$^2z%SBE|8cL&g zwS}fjtPg}Ci(G(N+glJjL3hc#AF&a6A~WN;$geu+2@(x5(}-3sazWC~x|DWfIwH%m|dwCR!U(Ke5wKAqeP+?+xjbcEpPx>vm9je zwX@)^R;b;l^k2W=OA@_lX~?<}LiW5~nK|??7PCEsrcm|{6EH@qUfRR0OIiq(IBxWK z#kuASKBdvyRJ&(=z}8hl)xXh*Dy4AWCP(1sY9N^o><#|_=6~R3=JQx=00000NkvXX Hu0mjfS(^fZ literal 0 HcmV?d00001 diff --git a/src/assets/img/shuju/fiveLayer/xfry.png b/src/assets/img/shuju/fiveLayer/xfry.png deleted file mode 100644 index 2edd8b27616045acbddc41d05a84e5891cb201bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmV+{0n`48P)Px#=1D|BR47wz&Ob{+VH5`N=Xt$gdM|eg%fY27@BIML($p#;xHz;5j&6Pj_i%B| zrJHPU|&LLJY83y|)!?u9AV{o#udDkUjKgUc^ z9EDc|4w9PWk(=vX{z1V5!QBK|%bK6>b=D|~LN5zF1N0LFspW0oH-B#$6)U7UTfK1W z=B9h()7ux)VX#`10000QaFeV{wqX6T`Z5GB1IglL0;jBlVQ=$;J|;lHL;jWrz03~#m>>2wJK$q> zz}xhYkNF{A(?h=I2ffV>`IsK?H9O=BlrjZ#%?|nk89=>eKy(O1ngVr!xV~T#Ar9d} zRf5z2O@piPMkq$s2r(8_L}s^g6wohDB|(0{3`{IsJiL4Y5|T=)>RP(`#+J6u{t0Or zS%pQ#rPbX%lNT*nzHZBoy@w7TJ$C%$xhq%i+`V`I(c>r2p1*nb@#n8UfB$*Tc)J;B zT92oTV~B)g=s{MdCI<$V14r|Gbl$kIG7EEm|KA^E>5$Jhuj2TOYso(*oBY`L)=lt| z#tRN!%`<{h!4XOed^BbV{xIVI74kz!jMci;;n$J%(R}t-)lY`=+GjoXyOb*`TCvIY z^3wCK#2KEP|5L8Zn0zX&!TBbmMbI{8lT#%OPoE`h+;;w4>i)>yTcQtmrOfr%h1zo0 Q0o}#m>FVdQ&MBb@0DsHLnE(I) literal 295 zcmV+?0oeYDP)Px#;Ymb6R47wz%^^zz0T{;d|8veTJPdvVlVB7*oNzKRsfP?K2CHCP^E=qZV%4&s z;9T9gps*_<2E(e^U~o9RM-=biz&E`Q?~msdf3wuzTAfmGCTVQ>G>dO95&6$q1&Y$0 z0a9FK2kd5X_ojkY(&R;Ap+Jbk;d=MHM2r1q7zW`hFk2$$C&Om%xYD#d*xr-X5t8A# zHeHV%);b@*sBzz@e|^p+NG-#@Ai#_e7tZtRY@_$6C{3;qt@2G}@dUG}=q`B&!v7H% t+KL9rk?jM}yzq>nCN##pS$={^`x{kJNRmoivIqbG002ovPDHLkV1no2e+vKr diff --git a/src/assets/img/shuju/fiveLayer/xiejiaorenyuan.png b/src/assets/img/shuju/fiveLayer/xiejiaorenyuan.png index 59010c1f875cf4acbce4292615e193b038a16c46..e5c1ed8e818d05ab14e46ea09bee2b5d3a62c763 100644 GIT binary patch literal 501 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeV{wqX6T`Z5GB1IglL0;RQdl{`TxT}RPq04<^Ll^$Bv&ocjfAxyZ7!tdi>+y7P43UrwJ;=(`e-)mvTi#D>m6)UV8qOIKz|kf68?klTW2J zINxNn2-?PMa;k*k>9d55+s>a$-5=R|OY{M+l(`Px# literal 286 zcmV+(0pb3MP)Px#*hxe|R47w*&Ob{+aTLb!@AE4R>0+;;sdpf$HMK?vE)K0iINcV#cWVjyGc-j@ zYb^~4z5qe4%^?mAuFVb(T@de)D|SPnGo8cpf#-M>o$IvR>08xAzScGDLEx%58h2E~o)-p!9_iii;{g z{49}uT;`eYoFY{bb-)2*&P)Px$qDe$SR5(wil)Fn@K@^9-bJaxzAL!l3s8}dz(jU}r)n_6ETD3AL_;8Rp)V9{Vd zB!WEL6@|GN(5AsoJOh;eqUdZiNVX0BNGwRf@o>Kb(=iq8b9`qLE2ILy_4A>L& eAjjp;GUE}{1$+~u((nWT0000Px#(@8`@R47wz&M`{@aTv$(@9)nok~ExWTwsG!?;u>7TtkGGhE}1`&G+CgF0QsT z6!Z>!1riPpZPf*JheLycdQX&{C(<)L56_3^`H8=J#jiPBU)aJy?}+49kp8Tdp@?84 zIL~H5BP4#@M^nM+4r+zOgDv`?TwG&sz+r~Ky2m7)y-WV3aCe&sHd&FJoxuDTy+Fak zzc5@=a0NKv85pk7Lxs<=B1-o{&HPQ?30tP5b-fdO0mc8&CQsT{L~sLKJE$6V0P?^V fpqXJ$hPA%|6$CoFCMR=%00000NkvXXu0mjf`a5(? diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss index 15ce8f9f..730d11a9 100644 --- a/src/assets/scss/modules/visual/fiveLayerMap.scss +++ b/src/assets/scss/modules/visual/fiveLayerMap.scss @@ -49,7 +49,7 @@ } .div_data { - flex: 0 0 600px; + flex: 0 0 610px; margin-left: 12px; .div_tips{ @@ -91,33 +91,38 @@ .div_category { box-sizing: border-box; height:238px; - padding:0 20px 20px; + padding:0 10px 20px; .category_item { margin-bottom: 15px; display: flex; - justify-content: start; - + justify-content: flex-start; + align-items: center; // margin:auto; .list_item { - + display: flex; // padding: 18px 59px 0; - justify-content: start; - flex:0 0 135px; + justify-content: flex-start; + flex:0 0 145px; + align-items: center; > img { - height: 18px; - width: 18px; + height: 16px; + width: 16px; + + // line-height: 25px; } .item_content{ - width:100px; + width:120px; margin-left:8px; font-size: 16px; font-family: PingFang SC; font-weight: 400; + + // line-height: 25px; color: #e5effa; } @@ -166,8 +171,11 @@ text-align: center; width: 559px; height: 48px; - background: #01106800; - border-radius: 8px; + background-color: #011168; + border-radius: 4px; + border: none; + box-shadow: 0 0 10px inset #1a5afd; + // border-radius: 8px; display: flex; justify-content: flex-end; @@ -175,25 +183,25 @@ display: flex; align-items: center; margin-left: 29px; - margin-top: 16px; + margin-top: 14px; > img { - width: 24px; - height: 24px; + width: 20px; + height: 20px; } } .btn { text-align: center; flex: 0 0 113px; - height: 53px; - background: #0082fb; - border-radius: 0px 8px 8px 0px; + height: 48px; + background: linear-gradient(90deg, #1A5AFD, #26C4FF); + border-radius: 0px 4px 4px 0px; font-size: 20px; font-family: PingFang SC; font-weight: 400; color: #ffffff; - line-height: 53px; + line-height: 48px; } .btn:hover { cursor: pointer; diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 92adf224..1811c8f4 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -48,9 +48,9 @@ @click="handleClickCategory(index,colIndex)"> - {{colItem.categoryName}} +
{{colItem.categoryName}} - +
@@ -108,8 +108,265 @@ +
+ class="popup-content"> +
+
居民信息
+
所属网格： + {{ selInfo.gridName }} +
+
所属小区： + {{ selInfo.villageName }} +
+
本地户籍： + {{ selInfo.isBdhjShow }} +
+
姓名： + {{ selInfo.icUserName }} +
+
手机： + {{ selInfo.mobile }} +
+
性别： + {{ selInfo.genderShow }} +
+
身份证号： + {{ selInfo.idCard }} +
+
出生日期： + {{ selInfo.birthday }} +
+
联系人： + {{ selInfo.contacts }} +
+
联系人手机： + {{ selInfo.contactsMobile }} +
+
志愿者类别： + {{ selInfo.categories }} +
+
+
+
企业信息
+
企业名称： + {{ selInfo.name }} +
+
企业类型： + {{ selInfo.categoryName }} +
+
周边安全距离： + {{ selInfo.safeDistance }} +
+
危化品种类： + {{ selInfo.dangerTypeName }} +
+
负责人： + {{ selInfo.principalName }} +
+
联系电话： + {{ selInfo.principalMobile }} +
+
经营地址： + {{ selInfo.address }} +
+
备注： + {{ selInfo.remark }} +
+
+
+
场所信息
+
场所名称： + {{ selInfo.name }} +
+
场所分类： + {{ selInfo.categoryName }} +
+
占地面积： + {{ selInfo.areaCovered }} +
+
容纳人数： + {{ selInfo.capacity }} +
+
地址： + {{ selInfo.address }} +
+
+
+ +
+
+ 所属网格： + {{ selInfo.gridName }} +
+
+ 发生时间： + {{ selInfo.happenTime }} +
+ +
+ 事件内容： + {{ selInfo.eventContent }} +
+ +
+ 图片： +
+ + +
+
+ +
+ 音频： +
+ + +
+ +
+
+ 反映渠道： + {{ selInfo.sourceTypeName || "--" }} +
+
+ 地址： + {{ selInfo.address || "--" }} +
+
+ 报事人： + {{ selInfo.name || "--" }} +
+
+ 手机号： + {{ selInfo.mobile || "--" }} +
+
+ 身份证号： + {{ selInfo.idCard || "--" }} +
+ +
+ +
+
+
组织信息
+
组织名称： + {{ selInfo.organizationName }} +
+
组织分类： + {{ selInfo.categoryName }} +
+
组织人数： + {{ selInfo.organizationPersonCount }} +
+
组织成员： + {{ selInfo.organizationPersonnelShow }} +
+
服务事项： + {{ selInfo.serviceItem }} +
+
负责人： + {{ selInfo.principalName }} +
+
联系电话： + {{ selInfo.principalPhone }} +
+
创建时间： + {{ selInfo.organizationCreatedTime }} +
+
+ +
+
房屋信息
+
房屋名称： + {{ selInfo.houseName }} +
+
房屋类型： + {{ selInfo.houseTypeName }} +
+
房屋用途： + {{ selInfo.purposeName }} +
+
房屋状态： + {{ selInfo.rentName }} +
+
房主姓名： + {{ selInfo.ownerName }} +
+
联系方式： + {{ selInfo.ownerPhone }} +
+
房主身份证： + {{ selInfo.ownerIdCard }} +
+ +
+
+
企事业信息
+
场所类型： + {{ selInfo.placeTypeName }} +
+
场所区域： + {{ selInfo.gridName }} +
+
场所名称： + {{ selInfo.placeOrgName }} +
+
场所地址： + {{ selInfo.address }} +
+
规模： + {{ selInfo.scale }} +
+
负责人： + {{ selInfo.personInCharge }} +
+
联系电话： + {{ selInfo.mobile }} +
+ +
+
+
联建单位信息
+
单位名称： + {{ selInfo.unitName }} +
+
分类： + {{ selInfo.typeName }} +
+
服务事项： + {{ selInfo.serviceMatterListShow }} +
+
联系人： + {{ selInfo.contact }} +
+
联系电话： + {{ selInfo.contactMobile }} +
+
在职党员： + {{ selInfo.memberCount }} +
+
备注： + {{ selInfo.remark }} +
+
地理位置： + {{ selInfo.address }} +
+
+ + 更多>>>> @@ -312,7 +569,7 @@ const vueGis = { pageSize: 10, demand: { - loading: true, + loading: false, colList: [ { align: "center", @@ -332,26 +589,70 @@ const vueGis = { }, iconUrlArray: { - 'volunteer1': require('../../../../../assets/img/shuju/volunteer1.png'), - 'volunteer2': require('../../../../../assets/img/shuju/volunteer2.png'), - 'volunteer3': require('../../../../../assets/img/shuju/volunteer3.png'), - 'volunteer4': require('../../../../../assets/img/shuju/volunteer4.png'), - 'volunteer5': require('../../../../../assets/img/shuju/volunteer5.png'), 'anzhibangjiao': require('../../../../../assets/img/shuju/fiveLayer/anzhibangjiao.png'), 'buliangqingshaonian': require('../../../../../assets/img/shuju/fiveLayer/buliangqingshaonian.png'), 'shequjiaozheng': require('../../../../../assets/img/shuju/fiveLayer/shequjiaozheng.png'), - 'xfry': require('../../../../../assets/img/shuju/fiveLayer/xfry.png'), + 'resi_xfry': require('../../../../../assets/img/shuju/fiveLayer/resi_xfry.png'), 'xidurenyuan': require('../../../../../assets/img/shuju/fiveLayer/xidurenyuan.png'), 'xiejiaorenyuan': require('../../../../../assets/img/shuju/fiveLayer/xiejiaorenyuan.png'), 'zhaoshizhaohuojingshenbing': require('../../../../../assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png'), + 'co_yjdw': require('../../../../../assets/img/shuju/fiveLayer/co_yjdw.png'), + 'sr_gy': require('../../../../../assets/img/shuju/fiveLayer/sr_gy.png'), + 'sr_gc': require('../../../../../assets/img/shuju/fiveLayer/sr_gc.png'), + 'co_whdw': require('../../../../../assets/img/shuju/fiveLayer/co_whdw.png'), + 'sr_ggld': require('../../../../../assets/img/shuju/fiveLayer/sr_ggld.png'), + 'co_lwh': require('../../../../../assets/img/shuju/fiveLayer/co_lwh.png'), + 'sr_tyc': require('../../../../../assets/img/shuju/fiveLayer/sr_tyc.png'), + 'co_lyjlb': require('../../../../../assets/img/shuju/fiveLayer/co_lyjlb.png'), + 'sr_yjy': require('../../../../../assets/img/shuju/fiveLayer/sr_yjy.png'), + 'co_zaxld': require('../../../../../assets/img/shuju/fiveLayer/co_zaxld.png'), + 'co_qt': require('../../../../../assets/img/shuju/fiveLayer/co_qt.png'), + 'sr_jzz': require('../../../../../assets/img/shuju/fiveLayer/sr_jzz.png'), + 'sr_djc': require('../../../../../assets/img/shuju/fiveLayer/sr_djc.png'), + 'sr_rfqck': require('../../../../../assets/img/shuju/fiveLayer/sr_rfqck.png'), + 'ep_lg': require('../../../../../assets/img/shuju/fiveLayer/ep_lg.png'), + 'sr_xfz': require('../../../../../assets/img/shuju/fiveLayer/sr_xfz.png'), + 'pu_jgzsbm': require('../../../../../assets/img/shuju/fiveLayer/pu_jgzsbm.png'), + + 'gr_czw': require('../../../../../assets/img/shuju/fiveLayer/gr_czw.png'), + 'ep_cycs': require('../../../../../assets/img/shuju/fiveLayer/ep_cycs.png'), + 'dc_jyz': require('../../../../../assets/img/shuju/fiveLayer/dc_jyz.png'), + 'ep_gwylcs': require('../../../../../assets/img/shuju/fiveLayer/ep_gwylcs.png'), + 'dc_jqz': require('../../../../../assets/img/shuju/fiveLayer/dc_jqz.png'), + 'dc_whpdw': require('../../../../../assets/img/shuju/fiveLayer/dc_whpdw.png'), + 'ep_wb': require('../../../../../assets/img/shuju/fiveLayer/ep_wb.png'), + 'ep_mrxycs': require('../../../../../assets/img/shuju/fiveLayer/ep_mrxycs.png'), + 'dc_yqhjz': require('../../../../../assets/img/shuju/fiveLayer/dc_yqhjz.png'), + 'dc_jzgd': require('../../../../../assets/img/shuju/fiveLayer/dc_jzgd.png'), + 'ep_scjgqy': require('../../../../../assets/img/shuju/fiveLayer/ep_scjgqy.png'), + + 'cm_nmsc': require('../../../../../assets/img/shuju/fiveLayer/cm_nmsc.png'), + 'event_tdnd': require('../../../../../assets/img/shuju/fiveLayer/event_tdnd.png'), + 'cm_bhsc': require('../../../../../assets/img/shuju/fiveLayer/cm_bhsc.png'), + 'cm_cjsc': require('../../../../../assets/img/shuju/fiveLayer/cm_cjsc.png'), + 'ep_lssd': require('../../../../../assets/img/shuju/fiveLayer/ep_lssd.png'), + + + 'resi_szry': require('../../../../../assets/img/shuju/fiveLayer/resi_szry.png'), + 'ps_lyy': require('../../../../../assets/img/shuju/fiveLayer/ps_lyy.png'), + 'resi_snry': require('../../../../../assets/img/shuju/fiveLayer/resi_snry.png'), + 'ps_mzb': require('../../../../../assets/img/shuju/fiveLayer/ps_mzb.png'), + 'ps_zs': require('../../../../../assets/img/shuju/fiveLayer/ps_zs.png'), + 'ps_wss': require('../../../../../assets/img/shuju/fiveLayer/ps_wss.png'), + 'ps_jjz': require('../../../../../assets/img/shuju/fiveLayer/ps_jjz.png'), + 'ep_xx': require('../../../../../assets/img/shuju/fiveLayer/ep_xx.png'), + 'ep_yy': require('../../../../../assets/img/shuju/fiveLayer/ep_yy.png'), + }, iconArrays: [], overlay: null, showPopup: false, + selPlaceType: '', + selInfo: {} } }, @@ -446,10 +747,11 @@ const vueGis = { //点击项目 async clickMapVolunteer (info) { + // info.placeType = 'resi' if (!info.id) { return false } - + this.selPlaceType = info.placeType if (info.placeType === 'resi' || info.placeType === 'specil_resi') {//综合治理图层和公共服务图层中的失能人员、失智人员 this.loadResi(info) } @@ -457,28 +759,29 @@ const vueGis = { this.loadPublicService(info) } if (info.placeType === 'dangerous_chemicals') {//重点危化品企业 - + this.loadDangerousChemicals(info) } if (info.placeType === 'event') {//难点痛点 - + this.loadEvent(info) } if (info.placeType === 'city_management') {//城市管理图层 - + this.loadCityManagement(info) } if (info.placeType === 'community_org') {//社区自组织 - + this.loadCommunityOrg(info) } if (info.placeType === 'superior_resource') {//优势资源 - + this.loadSuperiorResource(info) } - if (info.placeType === '') {//群租房 - + if (info.placeType === 'group_rent') {//群租房 + this.loadGroupRent(info) } - if (info.placeType === '') {//来自联建单位的机关直属部门 + if (info.placeType === 'party_unit') {//来自联建单位的机关直属部门 + this.loadPartyUnit(info) } - if (info.placeType === '') {//来自企事业查询的 - + if (info.placeType === 'enterprise_partrol') {//来自企事业查询的 + this.loadEnterprisePartrol(info) } @@ -517,45 +820,9 @@ const vueGis = { } else { data.categories = '--' } + this.selInfo = JSON.parse(JSON.stringify(data)) - let showData = ` -
居民信息
-
所属网格： - `+ data.gridName + ` -
-
所属小区： - `+ data.villageName + ` -
-
本地户籍： - `+ data.isBdhjShow + ` -
-
姓名： - `+ data.icUserName + ` -
-
手机： - `+ data.mobile + ` -
-
性别： - `+ data.genderShow + ` -
-
身份证号： - `+ data.idCard + ` -
-
出生日期： - `+ data.birthday + ` -
-
联系人： - `+ data.contacts + ` -
-
联系人手机： - `+ data.contactsMobile + ` -
-
志愿者类别： - `+ data.categories + ` -
- ` - // console.log(showData) - this.handleShowPopup(showData, coordinate, true) + this.handleShowPopup(coordinate, true) } else { this.$message.error(msg) @@ -580,34 +847,208 @@ const vueGis = { data.capacity = data.capacity ? data.capacity : '--' data.address = data.address ? data.address : '--' + this.selInfo = JSON.parse(JSON.stringify(data)) - let showData = ` -
场所信息
-
场所名称： - `+ data.name + ` -
-
场所分类： - `+ data.categoryName + ` -
-
占地面积： - `+ data.areaCovered + ` -
-
容纳人数： - `+ data.capacity + ` -
-
地址： - `+ data.address + ` -
- ` - // console.log(showData) - this.handleShowPopup(showData, coordinate, true) + + this.handleShowPopup(coordinate, false) + + } else { + this.$message.error(msg) + } + }, + + async loadEvent (info) { + const url = "/gov/project/icEvent/detail"; + //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId; + + const { data, code, msg } = await requestPost(url, { + icEventId: this.eventId, + }); + + if (code === 0) { + let coordinate = [info.longitude, info.latitude] + this.selInfo = JSON.parse(JSON.stringify(data)) + + this.handleShowPopup(coordinate, false) + + + + } else { + this.$message.error(msg) + } + }, + + async loadDangerousChemicals (info) { + // const url = "/gov/org/icDangerousChemicals/detail" + const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail" + + let params = { + icSuperiorResourceId: info.id + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + let coordinate = [info.longitude, info.latitude] + data.name = data.name ? data.name : '--' + data.categoryName = data.categoryName ? data.categoryName : '--' + data.safeDistance = data.safeDistance ? data.safeDistance : '--' + data.dangerTypeName = data.dangerTypeName ? data.dangerTypeName : '--' + data.principalName = data.principalName ? data.principalName : '--' + data.principalMobile = data.principalMobile ? data.principalMobile : '--' + data.address = data.address ? data.address : '--' + data.remark = data.remark ? data.remark : '--' + + this.selInfo = JSON.parse(JSON.stringify(data)) + + + this.handleShowPopup(coordinate, false) + + } else { + this.$message.error(msg) + } + }, + + async loadCityManagement (info) { + // const url = "/gov/org/icCityManagement/detail" + const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/detail" + + let params = { + icCityManagementId: info.id + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + let coordinate = [info.longitude, info.latitude] + data.name = data.name ? data.name : '--' + data.categoryName = data.categoryName ? data.categoryName : '--' + data.areaCovered = data.areaCovered ? data.areaCovered + '平方公里' : '--' + data.capacity = data.capacity ? data.capacity : '--' + data.address = data.address ? data.address : '--' + + this.selInfo = JSON.parse(JSON.stringify(data)) + + + this.handleShowPopup(coordinate, false) + + } else { + this.$message.error(msg) + } + }, + + async loadCommunityOrg (info) { + // const url = "/gov/org/icCityManagement/detail" + const url = "/heart/iccommunityselforganization/community-self-org-detail/" + info.id + + let params = {} + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + let coordinate = [info.longitude, info.latitude] + data.orgPersonArray = [] + data.organizationPersonnel.forEach(element => { + let orgPersonnel = element.personName + "(" + element.personPhone + ")" + data.orgPersonArray.push(orgPersonnel) + }); + + data.organizationPersonnelShow = data.orgPersonArray.join(",") + + this.selInfo = JSON.parse(JSON.stringify(data)) + + + this.handleShowPopup(coordinate, false) + + } else { + this.$message.error(msg) + } + }, + + async loadSuperiorResource (info) { + // const url = "/gov/org/icSuperiorResource/detail" + const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icSuperiorResource/detail" + + let params = { + icSuperiorResourceId: info.id + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + let coordinate = [info.longitude, info.latitude] + data.name = data.name ? data.name : '--' + data.categoryName = data.categoryName ? data.categoryName : '--' + data.areaCovered = data.areaCovered ? data.areaCovered + '平方公里' : '--' + data.capacity = data.capacity ? data.capacity : '--' + data.address = data.address ? data.address : '--' + + this.selInfo = JSON.parse(JSON.stringify(data)) + + + this.handleShowPopup(coordinate, false) + + } else { + this.$message.error(msg) + } + }, + + async loadEnterprisePartrol (info) { + // const url = "/gov/org/enterprise/detail" + const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail" + + const { data, code, msg } = await requestGet(url) + + if (code === 0) { + // debugger + let coordinate = [info.longitude, info.latitude] + + this.selInfo = JSON.parse(JSON.stringify(data)) } else { this.$message.error(msg) } }, + async loadGroupRent (info) { + const url = "/gov/org/ichouse/" + info.id - handleShowPopup (showData, coordinate, isShowMore) { + const { data, code, msg } = await requestGet(url) + + if (code === 0) { + // debugger + let coordinate = [info.longitude, info.latitude] + + this.selInfo = JSON.parse(JSON.stringify(data)) + + } else { + this.$message.error(msg) + } + }, + async loadPartyUnit (info) { + const url = '/heart/icpartyunit/detail' + // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail' + let params = { + id: info.id + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + let coordinate = [info.longitude, info.latitude] + if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) { + data.serviceMatterList = [] + } else { + data.serviceMatterListShow = data.serviceMatterNameList.join(',') + } + + this.selInfo = JSON.parse(JSON.stringify(data)) + } else { + this.$message.error(msg) + } + }, + + + handleShowPopup (coordinate, isShowMore) { if (isShowMore) { document.getElementById("popup-goMore").style.display = 'block' } else { @@ -618,7 +1059,7 @@ const vueGis = { this.overlay.getElement().style.display = 'block' this.overlay.getElement().parentNode.style.display = 'block' this.overlay.getElement().parentNode.parentNode.style.display = 'block' - content.innerHTML = showData; + // content.innerHTML = showData; this.overlay.setPosition(coordinate); //把 overlay 显示到指定的 x,y坐标 @@ -692,8 +1133,8 @@ const vueGis = { }, async loadCategoryList () { - // const url = "/gov/org/coverage/categoryList" - const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/categoryList" + const url = "/gov/org/coverage/categoryList" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/categoryList" let params = { coverageTypes: this.coverageTypes, @@ -702,171 +1143,17 @@ const vueGis = { const { data, code, msg } = await requestPost(url, params) if (code === 0) { - // this.categoryList = data - this.categoryList = [ + this.categoryList = data - { - categoryKey: "2", - categoryName: "deserunt" - }, - { - categoryKey: "3", - categoryName: "deserunt" - }, - { - categoryKey: "4", - categoryName: "deserunt" - }, - { - categoryKey: "0", - categoryName: "deserunt" - }, - { - categoryKey: "1", - categoryName: "deserunt" - }, - { - categoryKey: "2", - categoryName: "deserunt" - }, - { - categoryKey: "3", - categoryName: "deserunt" - }, - { - categoryKey: "4", - categoryName: "deserunt" - }, - { - categoryKey: "0", - categoryName: "deserunt" - }, - { - categoryKey: "1", - categoryName: "deserunt" - }, - { - categoryKey: "2", - categoryName: "deserunt" - }, - { - categoryKey: "3", - categoryName: "deserunt" - }, - { - categoryKey: "4", - categoryName: "deserunt" - }, - { - categoryKey: "0", - categoryName: "deserunt" - }, - { - categoryKey: "1", - categoryName: "deserunt" - }, - { - categoryKey: "2", - categoryName: "deserunt" - }, - { - categoryKey: "3", - categoryName: "deserunt" - }, - { - categoryKey: "4", - categoryName: "deserunt" - }, - { - categoryKey: "0", - categoryName: "deserunt" - }, - { - categoryKey: "1", - categoryName: "deserunt" - }, - { - categoryKey: "2", - categoryName: "deserunt" - }, - { - categoryKey: "3", - categoryName: "deserunt" - }, - { - categoryKey: "4", - categoryName: "deserunt" - }, - { - categoryKey: "0", - categoryName: "deserunt" - }, - { - categoryKey: "1", - categoryName: "deserunt" - }, - { - categoryKey: "2", - categoryName: "deserunt" - }, - { - categoryKey: "3", - categoryName: "deserunt" - }, - { - categoryKey: "4", - categoryName: "deserunt" - }, - { - categoryKey: "0", - categoryName: "deserunt" - }, - { - categoryKey: "1", - categoryName: "deserunt" - }, - { - categoryKey: "2", - categoryName: "deserunt" - }, - { - categoryKey: "3", - categoryName: "deserunt" - }, - { - categoryKey: "4", - categoryName: "机关直属部门" - }, - { - categoryKey: "0", - categoryName: "deserunt" - }, - { - categoryKey: "1", - categoryName: "deserunt" - }, - { - categoryKey: "2", - categoryName: "deserunt" - }, - { - categoryKey: "3", - categoryName: "deserunt" - }, - { - categoryKey: "4", - categoryName: "deserunt" - }, - ] this.categoryKeys = [] this.categoryListshow = [] let itemArray = [] this.categoryList.forEach((item, index) => { - if (!item.dataIcon) { - item.dataIcon = require('../../../../../assets/img/shuju/volunteer3.png') - } + + item.dataIcon = this.iconUrlArray[item.categoryKey] + item.sel = true this.categoryKeys.push(item.categoryKey) @@ -889,9 +1176,9 @@ const vueGis = { //加载组织数据 async getTable (isPage) { - this.demand.loading = true - // const url = "/data/aggregator/coverage/dataList"; - const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList"; + // this.demand.loading = true + const url = "/data/aggregator/coverage/dataList"; + // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList"; let params = { coverageTypes: this.coverageTypes, categoryKeys: this.categoryKeys, @@ -902,42 +1189,46 @@ const vueGis = { }; const { data, code, msg } = await requestPost(url, params); - this.demand.loading = false; + // this.demand.loading = false; if (code === 0) { this.demand.total = data.total; this.tableList = data.list - this.tableList = [ - { - categoryKey: "volunteer1", - content: "volunteer1", - id: "123", - latitude: "36.082230", - longitude: "120.3868167667315", - }, - { - categoryKey: "volunteer2", - content: "volunteer2", - id: "123", - latitude: "36.062227", - longitude: "120.389455", - }, - { - categoryKey: "volunteer3", - content: "volunteer3", - id: "123", - latitude: "36.072214", - longitude: "120.389455", - }, - { - categoryKey: "volunteer4", - content: "volunteer4", - id: "123", - latitude: "36.07394505338441", - longitude: "120.3868167667315", - } - ] + // this.tableList = [ + // { + // categoryKey: "resi_xfry", + // content: "信访人员", + // id: "123", + // latitude: "36.082230", + // longitude: "120.3868167667315", + // placeType: 'resi' + // }, + // { + // categoryKey: "sr_gy", + // content: "公园", + // id: "123", + // latitude: "36.062227", + // longitude: "120.389455", + // placeType: 'public_service' + // }, + // { + // categoryKey: "ep_scjgqy", + // content: "生产加工企业", + // id: "123", + // latitude: "36.072214", + // longitude: "120.389455", + // placeType: 'dangerous_chemicals' + // }, + // { + // categoryKey: "ps_wss", + // content: "卫生所（室）", + // id: "123", + // latitude: "36.07394505338441", + // longitude: "120.3868167667315", + // placeType: 'city_management' + // } + // ] this.demand.list = data.list.map((item) => { return [ item.categoryKey ? item.categoryKey : '--', @@ -952,8 +1243,8 @@ const vueGis = { //加载组织数据 async getMapTable () { - // const url = "/data/aggregator/coverage/dataList"; - const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList"; + const url = "/data/aggregator/coverage/dataList"; + // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList"; let params = { coverageTypes: this.coverageTypes, categoryKeys: this.categoryKeys, @@ -966,36 +1257,40 @@ const vueGis = { if (code === 0) { this.iconArrays = data.list - this.iconArrays = [ - { - categoryKey: "volunteer1", - content: "volunteer1", - id: "123", - latitude: "36.082230", - longitude: "120.3868167667315", - }, - { - categoryKey: "volunteer2", - content: "volunteer2", - id: "123", - latitude: "36.062227", - longitude: "120.389455", - }, - { - categoryKey: "volunteer3", - content: "volunteer3", - id: "123", - latitude: "36.072214", - longitude: "120.389455", - }, - { - categoryKey: "volunteer4", - content: "volunteer4", - id: "123", - latitude: "36.07394505338441", - longitude: "120.3868167667315", - } - ] + // this.iconArrays = [ + // { + // categoryKey: "resi_xfry", + // content: "信访人员", + // id: "123", + // latitude: "36.082230", + // longitude: "120.3868167667315", + // placeType: 'resi' + // }, + // { + // categoryKey: "sr_gy", + // content: "公园", + // id: "123", + // latitude: "36.062227", + // longitude: "120.389455", + // placeType: 'public_service' + // }, + // { + // categoryKey: "ep_scjgqy", + // content: "生产加工企业", + // id: "123", + // latitude: "36.072214", + // longitude: "120.389455", + // placeType: 'dangerous_chemicals' + // }, + // { + // categoryKey: "ps_wss", + // content: "卫生所（室）", + // id: "123", + // latitude: "36.07394505338441", + // longitude: "120.3868167667315", + // placeType: 'city_management' + // } + // ] this.iconArrays.forEach((item, index) => { item.url = this.iconUrlArray[item.categoryKey] @@ -1577,21 +1872,43 @@ export default vueGis; .ol-overlaycontainer-stopevent { display: none; } - + + + diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue index 79e71c99..0ae26f55 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue @@ -1,104 +1,215 @@ - - - - - + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/anzhibangjiao.vue b/src/views/modules/shequzhili/tuceng/zhonghe/anzhibangjiao.vue new file mode 100644 index 00000000..cfa4e62a --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/anzhibangjiao.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue new file mode 100644 index 00000000..0df94681 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue @@ -0,0 +1,788 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/buliangqingshaonian.vue b/src/views/modules/shequzhili/tuceng/zhonghe/buliangqingshaonian.vue new file mode 100644 index 00000000..51499380 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/buliangqingshaonian.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/shequjiaozheng.vue b/src/views/modules/shequzhili/tuceng/zhonghe/shequjiaozheng.vue new file mode 100644 index 00000000..0c59feaf --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/shequjiaozheng.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuanvue.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuanvue.vue new file mode 100644 index 00000000..f55fba23 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuanvue.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xiejiaorenyuan.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xiejiaorenyuan.vue new file mode 100644 index 00000000..477cd82d --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/xiejiaorenyuan.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue index 0b98fd9e..a9624c93 100644 --- a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue +++ b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue @@ -1,840 +1,35 @@ - + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/zhaoshizhaohuojingshenbing.vue b/src/views/modules/shequzhili/tuceng/zhonghe/zhaoshizhaohuojingshenbing.vue new file mode 100644 index 00000000..013b03b6 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/zhaoshizhaohuojingshenbing.vue @@ -0,0 +1,35 @@ + + + + + From 78c80a7d38c1e271987b8a1726bd1939037a4e60 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 21 Jun 2022 13:57:18 +0800 Subject: [PATCH 21/68] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shuju/fiveLayer/{co_lwh.png => lwh.png} | Bin .../fiveLayer/{co_lyjlb.png => lyjlb.png} | Bin .../shuju/fiveLayer/{co_qt.png => other.png} | Bin .../shuju/fiveLayer/{co_whdw.png => whdw.png} | Bin .../shuju/fiveLayer/{co_yjdw.png => yjdw.png} | Bin .../fiveLayer/{co_zaxld.png => zaxld.png} | Bin .../modules/visual/basicinfo/peopleSearch.vue | 2 +- .../communityGovern/fivelayers/mapIndex.vue | 194 +++++++++--------- 8 files changed, 101 insertions(+), 95 deletions(-) rename src/assets/img/shuju/fiveLayer/{co_lwh.png => lwh.png} (100%) rename src/assets/img/shuju/fiveLayer/{co_lyjlb.png => lyjlb.png} (100%) rename src/assets/img/shuju/fiveLayer/{co_qt.png => other.png} (100%) rename src/assets/img/shuju/fiveLayer/{co_whdw.png => whdw.png} (100%) rename src/assets/img/shuju/fiveLayer/{co_yjdw.png => yjdw.png} (100%) rename src/assets/img/shuju/fiveLayer/{co_zaxld.png => zaxld.png} (100%) diff --git a/src/assets/img/shuju/fiveLayer/co_lwh.png b/src/assets/img/shuju/fiveLayer/lwh.png similarity index 100% rename from src/assets/img/shuju/fiveLayer/co_lwh.png rename to src/assets/img/shuju/fiveLayer/lwh.png diff --git a/src/assets/img/shuju/fiveLayer/co_lyjlb.png b/src/assets/img/shuju/fiveLayer/lyjlb.png similarity index 100% rename from src/assets/img/shuju/fiveLayer/co_lyjlb.png rename to src/assets/img/shuju/fiveLayer/lyjlb.png diff --git a/src/assets/img/shuju/fiveLayer/co_qt.png b/src/assets/img/shuju/fiveLayer/other.png similarity index 100% rename from src/assets/img/shuju/fiveLayer/co_qt.png rename to src/assets/img/shuju/fiveLayer/other.png diff --git a/src/assets/img/shuju/fiveLayer/co_whdw.png b/src/assets/img/shuju/fiveLayer/whdw.png similarity index 100% rename from src/assets/img/shuju/fiveLayer/co_whdw.png rename to src/assets/img/shuju/fiveLayer/whdw.png diff --git a/src/assets/img/shuju/fiveLayer/co_yjdw.png b/src/assets/img/shuju/fiveLayer/yjdw.png similarity index 100% rename from src/assets/img/shuju/fiveLayer/co_yjdw.png rename to src/assets/img/shuju/fiveLayer/yjdw.png diff --git a/src/assets/img/shuju/fiveLayer/co_zaxld.png b/src/assets/img/shuju/fiveLayer/zaxld.png similarity index 100% rename from src/assets/img/shuju/fiveLayer/co_zaxld.png rename to src/assets/img/shuju/fiveLayer/zaxld.png diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue index c28c2cf3..8193f9f1 100644 --- a/src/views/modules/visual/basicinfo/peopleSearch.vue +++ b/src/views/modules/visual/basicinfo/peopleSearch.vue @@ -180,7 +180,7 @@ export default { async toSubAgency (type, userId) { - + return this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${userId}` }); // this.orgLevel = 'people' // this.selUserId = userId diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 1026b6c2..fb83c3f9 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -2,19 +2,23 @@
+
- {{item.name}}> +
+ 五大图层 +
+
五大图层> - {{orgData.name}} + 个人档案 +
-
+
志愿者类别： {{ selInfo.categories }}
+
+
更多
+
企业信息
@@ -367,10 +375,12 @@
- 更多>>>> +
+ + @@ -399,6 +409,7 @@ import { requestPost } from "@/js/dai/request"; import cptTb from "@/views/modules/visual/cpts/tb"; import cptCard from "@/views/modules/visual/cpts/card"; import ScreenLoading from "@/views/modules/visual/cpts/loading"; +import People from "../../basicinfo/people"; var centerPointGlobal = [120.664619, 36.504963] @@ -521,8 +532,7 @@ const vueGis = { //下钻层级记录 runNum: 0, - runAgencyArray: [], - selUserId: '', + routerArray: [], center: [], zoom: null, parentPolygon: [], @@ -599,17 +609,17 @@ const vueGis = { 'zhaoshizhaohuojingshenbing': require('../../../../../assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png'), - 'co_yjdw': require('../../../../../assets/img/shuju/fiveLayer/co_yjdw.png'), + 'yjdw': require('../../../../../assets/img/shuju/fiveLayer/yjdw.png'), 'sr_gy': require('../../../../../assets/img/shuju/fiveLayer/sr_gy.png'), 'sr_gc': require('../../../../../assets/img/shuju/fiveLayer/sr_gc.png'), - 'co_whdw': require('../../../../../assets/img/shuju/fiveLayer/co_whdw.png'), + 'whdw': require('../../../../../assets/img/shuju/fiveLayer/whdw.png'), 'sr_ggld': require('../../../../../assets/img/shuju/fiveLayer/sr_ggld.png'), - 'co_lwh': require('../../../../../assets/img/shuju/fiveLayer/co_lwh.png'), + 'lwh': require('../../../../../assets/img/shuju/fiveLayer/lwh.png'), 'sr_tyc': require('../../../../../assets/img/shuju/fiveLayer/sr_tyc.png'), - 'co_lyjlb': require('../../../../../assets/img/shuju/fiveLayer/co_lyjlb.png'), + 'lyjlb': require('../../../../../assets/img/shuju/fiveLayer/lyjlb.png'), 'sr_yjy': require('../../../../../assets/img/shuju/fiveLayer/sr_yjy.png'), - 'co_zaxld': require('../../../../../assets/img/shuju/fiveLayer/co_zaxld.png'), - 'co_qt': require('../../../../../assets/img/shuju/fiveLayer/co_qt.png'), + 'zaxld': require('../../../../../assets/img/shuju/fiveLayer/zaxld.png'), + 'other': require('../../../../../assets/img/shuju/fiveLayer/other.png'), 'sr_jzz': require('../../../../../assets/img/shuju/fiveLayer/sr_jzz.png'), 'sr_djc': require('../../../../../assets/img/shuju/fiveLayer/sr_djc.png'), 'sr_rfqck': require('../../../../../assets/img/shuju/fiveLayer/sr_rfqck.png'), @@ -652,7 +662,9 @@ const vueGis = { showPopup: false, selPlaceType: '', - selInfo: {} + selInfo: {}, + selUserId: '', + showPeopleInfo: false } }, @@ -691,13 +703,17 @@ const vueGis = { }, methods: { + toPeople () { + this.showPeopleInfo = true + }, + //添加覆盖层 addOverlay () { // 使用变量存储弹窗所需的 DOM 对象 var container = document.getElementById("popup"); var closer = document.getElementById("popup-closer"); var content = document.getElementById("popup-content"); - var goMore = document.getElementById("popup-goMore") ? document.getElementById("popup-goMore") : null + // 创建一个弹窗 Overlay 对象 this.overlay = new Overlay({ @@ -720,11 +736,7 @@ const vueGis = { closer.blur(); return false; }; - if (goMore) { - goMore.onclick = function () { - _that.$emit('lookMore') - }; - } + }, //注册地图点击事件 @@ -753,6 +765,8 @@ const vueGis = { } this.selPlaceType = info.placeType if (info.placeType === 'resi' || info.placeType === 'specil_resi') {//综合治理图层和公共服务图层中的失能人员、失智人员 + info.id = "dd0bd55db0ca4b629c40bc914a08368e" + this.selUserId = info.id this.loadResi(info) } if (info.placeType === 'public_service') {//公共服务图层 @@ -788,7 +802,7 @@ const vueGis = { }, async loadResi (info) { - const url = "/epmetuser/icresiuser/resi-brief/" + 'dd0bd55db0ca4b629c40bc914a08368e' + const url = "/epmetuser/icresiuser/resi-brief/" + info.id // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution" let params = {} @@ -822,7 +836,7 @@ const vueGis = { } this.selInfo = JSON.parse(JSON.stringify(data)) - this.handleShowPopup(coordinate, true) + this.handleShowPopup(coordinate) } else { this.$message.error(msg) @@ -850,7 +864,7 @@ const vueGis = { this.selInfo = JSON.parse(JSON.stringify(data)) - this.handleShowPopup(coordinate, false) + this.handleShowPopup(coordinate) } else { this.$message.error(msg) @@ -869,7 +883,7 @@ const vueGis = { let coordinate = [info.longitude, info.latitude] this.selInfo = JSON.parse(JSON.stringify(data)) - this.handleShowPopup(coordinate, false) + this.handleShowPopup(coordinate) @@ -902,7 +916,7 @@ const vueGis = { this.selInfo = JSON.parse(JSON.stringify(data)) - this.handleShowPopup(coordinate, false) + this.handleShowPopup(coordinate) } else { this.$message.error(msg) @@ -930,7 +944,7 @@ const vueGis = { this.selInfo = JSON.parse(JSON.stringify(data)) - this.handleShowPopup(coordinate, false) + this.handleShowPopup(coordinate) } else { this.$message.error(msg) @@ -958,7 +972,7 @@ const vueGis = { this.selInfo = JSON.parse(JSON.stringify(data)) - this.handleShowPopup(coordinate, false) + this.handleShowPopup(coordinate) } else { this.$message.error(msg) @@ -986,7 +1000,7 @@ const vueGis = { this.selInfo = JSON.parse(JSON.stringify(data)) - this.handleShowPopup(coordinate, false) + this.handleShowPopup(coordinate) } else { this.$message.error(msg) @@ -1048,12 +1062,8 @@ const vueGis = { }, - handleShowPopup (coordinate, isShowMore) { - if (isShowMore) { - document.getElementById("popup-goMore").style.display = 'block' - } else { - document.getElementById("popup-goMore").style.display = 'none' - } + handleShowPopup (coordinate) { + // console.log(this.overlay.getElement()) let content = document.getElementById("popup-content"); this.overlay.getElement().style.display = 'block' @@ -1270,40 +1280,40 @@ const vueGis = { if (code === 0) { this.iconArrays = data.list - // this.iconArrays = [ - // { - // categoryKey: "resi_xfry", - // content: "信访人员", - // id: "123", - // latitude: "36.082230", - // longitude: "120.3868167667315", - // placeType: 'resi' - // }, - // { - // categoryKey: "sr_gy", - // content: "公园", - // id: "123", - // latitude: "36.062227", - // longitude: "120.389455", - // placeType: 'public_service' - // }, - // { - // categoryKey: "ep_scjgqy", - // content: "生产加工企业", - // id: "123", - // latitude: "36.072214", - // longitude: "120.389455", - // placeType: 'dangerous_chemicals' - // }, - // { - // categoryKey: "ps_wss", - // content: "卫生所（室）", - // id: "123", - // latitude: "36.07394505338441", - // longitude: "120.3868167667315", - // placeType: 'city_management' - // } - // ] + this.iconArrays = [ + { + categoryKey: "resi_xfry", + content: "信访人员", + id: "123", + latitude: "36.082230", + longitude: "120.3868167667315", + placeType: 'resi' + }, + { + categoryKey: "sr_gy", + content: "公园", + id: "123", + latitude: "36.062227", + longitude: "120.389455", + placeType: 'public_service' + }, + { + categoryKey: "ep_scjgqy", + content: "生产加工企业", + id: "123", + latitude: "36.072214", + longitude: "120.389455", + placeType: 'dangerous_chemicals' + }, + { + categoryKey: "ps_wss", + content: "卫生所（室）", + id: "123", + latitude: "36.07394505338441", + longitude: "120.3868167667315", + placeType: 'city_management' + } + ] this.iconArrays.forEach((item, index) => { item.url = this.iconUrlArray[item.categoryKey] @@ -1438,26 +1448,10 @@ const vueGis = { }, //返回所选组织 - handleClickAgency (index) { - - const cutNum = this.runAgencyArray.length - index//要减去的长度 - this.runNum = this.runNum - cutNum + handleClickRouter (index) { - this.orgData = this.runAgencyArray[index] + this.showPeopleInfo = false - for (let i = 0; i < cutNum; i++) { - this.runAgencyArray.pop() - } - - this.orgId = this.orgData.id - this.orgLevel = this.orgData.level - this.center = this.orgData.center - this.zoom = this.orgData.zoom - - this.$nextTick(() => { - this.refreshMap(true) - this.$forceUpdate() - }); }, @@ -1865,7 +1859,7 @@ const vueGis = { ...mapGetters(["clientHeight"]) }, - components: { cptTb, cptCard, ScreenLoading }, + components: { cptTb, cptCard, ScreenLoading, People }, } export default vueGis; @@ -1899,6 +1893,20 @@ export default vueGis; color: #ffffff; margin-top: 5px; } + +.div_resi_more { + display: flex; + justify-content: center; + margin-top: 20px; +} + +.span_resi_more { + font-size: 16px; + text-decoration: underline; +} +.span_resi_more:hover { + cursor: pointer; +} diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index e3fe202b..3f78f374 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -30,7 +30,7 @@ > @@ -148,15 +148,15 @@ >查看 编辑{{ editBtnName(scope.row) }} + > + + @@ -275,10 +286,33 @@ export default { default: "", }, + editAuth: { + type: Function, + default: () => true, + }, + editBtnName: { + type: Function, + default: () => "编辑", + }, + delAuth: { + type: Function, + default: () => true, + }, + editParams: { type: Array, default: () => [], }, + editFixedParams: { + type: Object, + default: () => { + return {}; + }, + }, + editParamsDiv: { + type: Number, + default: 0, + }, idName: { type: String, @@ -495,7 +529,7 @@ export default { const { idName } = this; this.formType = "edit"; this.formId = row[idName]; - this.formTitle = "编辑"; + this.formTitle = "修改"; this.formShow = true; }, diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/edit.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/edit.vue deleted file mode 100644 index 3b1d06b8..00000000 --- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/edit.vue +++ /dev/null @@ -1,531 +0,0 @@ - - - - - diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue new file mode 100644 index 00000000..6d681bd8 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue @@ -0,0 +1,536 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue index 0ae26f55..6f088b43 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue @@ -8,19 +8,30 @@ :editUrl="editUrl" :delUrl="delUrl" :infoUrl="infoUrl" + :editAuth="editAuth" + :delAuth="delAuth" :exportUrl="exportUrl" :importUrl="importUrl" :mubanUrl="mubanUrl" :editParams="editParams" + :editFixedParams="editFixedParams" + :editParamsDiv="5" + :editBtnName="(item) => (item.sourceType == 'import' ? '待完善' : '修改')" idName="enterpriseId" - > + > + + - + diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index fb83c3f9..a8cf0094 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -115,7 +115,7 @@
-
+
居民信息
所属网格： {{ selInfo.gridName }} @@ -201,71 +201,59 @@
+
难点痛点
+
所属网格： + {{ selInfo.gridName }} +
+
发生时间： + {{ selInfo.happenTime }} +
+
事件内容： + {{ selInfo.eventContent }} +
-
-
- 所属网格： - {{ selInfo.gridName }} -
-
- 发生时间： - {{ selInfo.happenTime }} -
- -
- 事件内容： - {{ selInfo.eventContent }} -
- -
- 图片： -
- +
+ 图片： +
+ -
+
-
- 音频： -
- - -
+
+ 音频： +
+
-
- 反映渠道： - {{ selInfo.sourceTypeName || "--" }} -
-
- 地址： - {{ selInfo.address || "--" }} -
-
- 报事人： - {{ selInfo.name || "--" }} -
-
- 手机号： - {{ selInfo.mobile || "--" }} -
-
- 身份证号： - {{ selInfo.idCard || "--" }} -
+
反映渠道： + {{ selInfo.sourceTypeName|| "--" }} +
+
地址： + {{ selInfo.address || "--" }} +
+
报事人： + {{selInfo.name || "--" }} +
+
手机号： + {{ selInfo.mobile || "--" }} +
+
身份证号： + {{ selInfo.idCard || "--" }} +
@@ -581,19 +569,23 @@ const vueGis = { demand: { loading: false, colList: [ + { + align: "center", + width: "15%", + }, { align: "center", width: "25%", }, { align: "center", - width: "75%", + width: "60%", }, ], - header: ["分类", "名称"], + header: ["图例", "分类", "名称"], list: [], - pageSize: 10, + pageSize: 50, pageNo: 1, total: 0, }, @@ -763,9 +755,13 @@ const vueGis = { if (!info.id) { return false } + if (!info.latitude || !info.longitude) { + this.$message.warning("请先完善坐标位置") + return false + } this.selPlaceType = info.placeType - if (info.placeType === 'resi' || info.placeType === 'specil_resi') {//综合治理图层和公共服务图层中的失能人员、失智人员 - info.id = "dd0bd55db0ca4b629c40bc914a08368e" + if (info.placeType === 'resi' || info.placeType === 'special_resi') {//综合治理图层和公共服务图层中的失能人员、失智人员 + // info.id = "dd0bd55db0ca4b629c40bc914a08368e" this.selUserId = info.id this.loadResi(info) } @@ -844,8 +840,8 @@ const vueGis = { }, async loadPublicService (info) { - // const url = "/gov/org/icPublicService/detail" - const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail" + const url = "/gov/org/icPublicService/detail" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail" let params = { icPublicServiceId: info.id @@ -876,7 +872,7 @@ const vueGis = { //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId; const { data, code, msg } = await requestPost(url, { - icEventId: this.eventId, + icEventId: info.id, }); if (code === 0) { @@ -893,8 +889,8 @@ const vueGis = { }, async loadDangerousChemicals (info) { - // const url = "/gov/org/icDangerousChemicals/detail" - const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail" + const url = "/gov/org/icDangerousChemicals/detail" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail" let params = { icSuperiorResourceId: info.id @@ -924,8 +920,8 @@ const vueGis = { }, async loadCityManagement (info) { - // const url = "/gov/org/icCityManagement/detail" - const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/detail" + const url = "/gov/org/icCityManagement/detail" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/detail" let params = { icCityManagementId: info.id @@ -980,8 +976,8 @@ const vueGis = { }, async loadSuperiorResource (info) { - // const url = "/gov/org/icSuperiorResource/detail" - const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icSuperiorResource/detail" + const url = "/gov/org/icSuperiorResource/detail" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icSuperiorResource/detail" let params = { icSuperiorResourceId: info.id @@ -1008,8 +1004,8 @@ const vueGis = { }, async loadEnterprisePartrol (info) { - // const url = "/gov/org/enterprise/detail" - const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail" + const url = "/gov/org/enterprise/detail" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail" const { data, code, msg } = await requestGet(url) @@ -1018,7 +1014,7 @@ const vueGis = { let coordinate = [info.longitude, info.latitude] this.selInfo = JSON.parse(JSON.stringify(data)) - + this.handleShowPopup(coordinate) } else { this.$message.error(msg) } @@ -1033,7 +1029,7 @@ const vueGis = { let coordinate = [info.longitude, info.latitude] this.selInfo = JSON.parse(JSON.stringify(data)) - + this.handleShowPopup(coordinate) } else { this.$message.error(msg) } @@ -1056,6 +1052,7 @@ const vueGis = { } this.selInfo = JSON.parse(JSON.stringify(data)) + this.handleShowPopup(coordinate) } else { this.$message.error(msg) } @@ -1083,6 +1080,7 @@ const vueGis = { //点击图层 async handleClickCoverage (index) { + this.demand.pageNo = 1 this.coverageTypesList[index].select = !this.coverageTypesList[index].select let item = this.coverageTypesList[index] @@ -1103,7 +1101,7 @@ const vueGis = { //点击类别 async handleClickCategory (index, colIndex) { - + this.demand.pageNo = 1 this.categoryListshow[index][colIndex].sel = !this.categoryListshow[index][colIndex].sel // this.categoryList[index * 4 + colIndex].sel = !this.categoryList[index * 4 + colIndex].sel @@ -1134,6 +1132,7 @@ const vueGis = { let selData = this.tableList[index] mapView.setCenter([selData.longitude, selData.latitude]); this.clickMapVolunteer(selData) + // alert(index) }, @@ -1185,10 +1184,10 @@ const vueGis = { }, //加载组织数据 - async getTable (isPage) { - // this.demand.loading = true - // const url = "/data/aggregator/coverage/dataList"; - const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList"; + async getTable () { + this.demand.loading = true + const url = "/data/aggregator/coverage/dataList"; + // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList"; let params = { coverageTypes: this.coverageTypes, categoryKeys: this.categoryKeys, @@ -1199,46 +1198,12 @@ const vueGis = { }; const { data, code, msg } = await requestPost(url, params); - // this.demand.loading = false; + this.demand.loading = false; if (code === 0) { this.demand.total = data.total; - data.list = [ - { - categoryKey: "resi_xfry", - content: "信访人员", - id: "123", - latitude: "36.082230", - longitude: "120.3868167667315", - placeType: 'resi' - }, - { - categoryKey: "sr_gy", - content: "公园", - id: "123", - latitude: "36.062227", - longitude: "120.389455", - placeType: 'public_service' - }, - { - categoryKey: "ep_scjgqy", - content: "生产加工企业", - id: "123", - latitude: "36.072214", - longitude: "120.389455", - placeType: 'dangerous_chemicals' - }, - { - categoryKey: "ps_wss", - content: "卫生所（室）", - id: "123", - latitude: "36.07394505338441", - longitude: "120.3868167667315", - placeType: 'city_management' - } - ] this.tableList = data.list this.demand.list = data.list this.demand.list.forEach(item => { @@ -1254,6 +1219,7 @@ const vueGis = { // item.categoryKey ? item.categoryKey : '--', item.imgObj, + item.categoryName, item.content ? item.content : '', ]; @@ -1266,8 +1232,8 @@ const vueGis = { //加载组织数据 async getMapTable () { - // const url = "/data/aggregator/coverage/dataList"; - const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList"; + const url = "/data/aggregator/coverage/dataList"; + // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList"; let params = { coverageTypes: this.coverageTypes, categoryKeys: this.categoryKeys, @@ -1279,43 +1245,12 @@ const vueGis = { const { data, code, msg } = await requestPost(url, params); if (code === 0) { + + this.demand.total = data.total; + this.iconArrays = data.list - this.iconArrays = [ - { - categoryKey: "resi_xfry", - content: "信访人员", - id: "123", - latitude: "36.082230", - longitude: "120.3868167667315", - placeType: 'resi' - }, - { - categoryKey: "sr_gy", - content: "公园", - id: "123", - latitude: "36.062227", - longitude: "120.389455", - placeType: 'public_service' - }, - { - categoryKey: "ep_scjgqy", - content: "生产加工企业", - id: "123", - latitude: "36.072214", - longitude: "120.389455", - placeType: 'dangerous_chemicals' - }, - { - categoryKey: "ps_wss", - content: "卫生所（室）", - id: "123", - latitude: "36.07394505338441", - longitude: "120.3868167667315", - placeType: 'city_management' - } - ] - this.iconArrays.forEach((item, index) => { + this.iconArrays.forEach((item, index) => { item.url = this.iconUrlArray[item.categoryKey] }); @@ -1888,6 +1823,31 @@ export default vueGis; padding-bottom: 5px; } +.info-prop { + position: relative; + margin: 10px 0; + display: flex; + padding-left: 15px; + font-size: 12px; + + .info-pics { + display: flex; + margin: 10px 0; + img { + display: block; + width: 32%; + height: 90px; + margin-right: 9px; + object-fit: cover; + } + } + > span, + > div { + display: block; + max-width: 300px; + } +} + .popContentTitle { font-size: 12px; color: #ffffff; From 73cb22a4ba4f94812ac200c87f41459f6bb875a0 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 23 Jun 2022 10:11:06 +0800 Subject: [PATCH 34/68] =?UTF-8?q?=E6=97=A0=E9=99=90=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cpts/base/cpts/edit.vue | 7 +++++-- src/views/modules/cpts/base/index.vue | 3 ++- .../modules/shequzhili/tuceng/anquan/weihua/index.vue | 1 + .../modules/shequzhili/tuceng/anquan/xuncha/index.vue | 2 +- .../modules/shequzhili/tuceng/yingji/ziyuan/index.vue | 1 + 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index 0b81cbc1..34cb29a5 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -435,8 +435,11 @@ export default { // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 initMap(item) { - const { latitude = 39.79069, longitude = 116.506907 } = - this.$store.state.user; + let { latitude, longitude } = this.$store.state.user; + if (!latitude || latitude == "" || latitude == "0") { + latitude = 39.9088810666821; + longitude = 116.39743841556731; + } // 定义地图中心点坐标 var center = new window.TMap.LatLng(latitude, longitude); // 定义map变量，调用 TMap.Map() 构造函数创建地图 diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 7c4d678c..a4033ae9 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -535,11 +535,12 @@ export default { handleClose() { this.formShow = false; + this.getTableData(); }, handleEditSuccess() { this.handleClose(); - this.getTableData(); + // this.getTableData(); }, async handleDelete(rowData, rowIndex) { diff --git a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue index 91301a2e..b70bd83d 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue @@ -12,6 +12,7 @@ :importUrl="importUrl" :mubanUrl="mubanUrl" :editParams="editParams" + :editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')" idName="icDangerousChemicalsId" >
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue index d52526b0..c0f74589 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue @@ -93,7 +93,7 @@ export default { { field: "场所名称", keyName: "placeOrgName", type: "text" }, { field: "场所地址", keyName: "address", type: "text" }, { field: "场所类型", keyName: "placeTypeName", type: "text" }, - { field: "规模", keyName: "scale", type: "text" }, + { field: "规模", keyName: "scaleName", type: "text" }, { field: "负责人", keyName: "personInCharge", type: "text" }, { field: "联系电话", keyName: "mobile", type: "text" }, { field: "最新检查时间", keyName: "latestPatrolTime", type: "text" }, diff --git a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue index 61459b13..62ca95c9 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue @@ -12,6 +12,7 @@ :importUrl="importUrl" :mubanUrl="mubanUrl" :editParams="editParams" + :editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')" idName="icSuperiorResourceId" >
From 9bb4543fe33f509e58582a652f43e79cb980ea13 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 23 Jun 2022 11:18:44 +0800 Subject: [PATCH 35/68] =?UTF-8?q?=E6=AC=A7=E6=8B=89=E6=8B=89=E6=94=B9?= =?UTF-8?q?=E6=94=B9=E6=94=B9bg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cpts/base/cpts/edit.vue | 18 +++++++++++++++++- src/views/modules/cpts/base/index.vue | 6 ++++++ .../shequzhili/tuceng/anquan/xuncha/index.vue | 8 +++++++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index 34cb29a5..8955e14d 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -265,6 +265,18 @@
+
+ 取 消 + 确 定 +
+
-
+
取 消 @@ -318,6 +319,11 @@ export default { type: String, default: "id", }, + + formBtnFixed: { + type: Boolean, + default: true, + }, }, data() { diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue index c0f74589..c8a27662 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue @@ -17,10 +17,16 @@ :editFixedParams="editFixedParams" :editParamsDiv="5" :editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')" + :formBtnFixed="false" idName="enterpriseId" >
From baacfe68da617279aa579de392d2e09d71b87ae5 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 23 Jun 2022 13:38:12 +0800 Subject: [PATCH 36/68] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ninePlaces/places/places.vue | 20 ++++++++++--- .../ninePlaces/places/placesForm.vue | 28 ++++++++++++++++--- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue index 9c44dd6a..820e98c5 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -148,12 +148,16 @@ class="operate"> - +