diff --git a/.env.development b/.env.development index fa857bf2..fd937c0d 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,7 @@ NODE_ENV=development # VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api VUE_APP_API_SERVER = http://192.168.1.140/api +# VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api # VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api diff --git a/package.json b/package.json index 3def21d3..ca7e8abb 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "dependencies": { "@riophae/vue-treeselect": "^0.4.0", "@tinymce/tinymce-vue": "^3.2.8", + "async-validator": "^4.2.5", "axios": "^0.19.0", "babel-eslint": "^8.0.1", "babel-plugin-component": "^1.1.1", diff --git a/src/assets/img/shuju/fiveLayer/anzhibangjiao.png b/src/assets/img/shuju/fiveLayer/anzhibangjiao.png new file mode 100644 index 00000000..42152b04 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/anzhibangjiao.png differ diff --git a/src/assets/img/shuju/fiveLayer/buliangqingshaonian.png b/src/assets/img/shuju/fiveLayer/buliangqingshaonian.png new file mode 100644 index 00000000..56b95be1 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/buliangqingshaonian.png differ 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 00000000..70b91933 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/cm_bhsc.png differ 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 00000000..929bce9a Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/cm_cjsc.png differ diff --git a/src/assets/img/shuju/fiveLayer/cm_nmsc.png b/src/assets/img/shuju/fiveLayer/cm_nmsc.png new file mode 100644 index 00000000..c1359dd6 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/cm_nmsc.png differ 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 00000000..6a7cd1ea Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/dc_jqz.png differ 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 00000000..d58fbb6a Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/dc_jyz.png differ diff --git a/src/assets/img/shuju/fiveLayer/dc_jzgd.png b/src/assets/img/shuju/fiveLayer/dc_jzgd.png new file mode 100644 index 00000000..59fb9521 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/dc_jzgd.png differ diff --git a/src/assets/img/shuju/fiveLayer/dc_whpdw.png b/src/assets/img/shuju/fiveLayer/dc_whpdw.png new file mode 100644 index 00000000..114d13db Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/dc_whpdw.png differ 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 00000000..9a125cc7 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/dc_yqhjz.png differ diff --git a/src/assets/img/shuju/fiveLayer/ep_cycs.png b/src/assets/img/shuju/fiveLayer/ep_cycs.png new file mode 100644 index 00000000..0d09e4c8 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ep_cycs.png differ diff --git a/src/assets/img/shuju/fiveLayer/ep_gwylcs.png b/src/assets/img/shuju/fiveLayer/ep_gwylcs.png new file mode 100644 index 00000000..b514971b Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ep_gwylcs.png differ 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 00000000..f6f13343 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ep_lg.png differ 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 00000000..1711df8e Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ep_lssd.png differ 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 00000000..66691dbf Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ep_mrxycs.png differ diff --git a/src/assets/img/shuju/fiveLayer/ep_scjgqy.png b/src/assets/img/shuju/fiveLayer/ep_scjgqy.png new file mode 100644 index 00000000..14ba5480 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ep_scjgqy.png differ 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 00000000..4e9dc1b1 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ep_wb.png differ 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 00000000..8dd8c4e0 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ep_xx.png differ 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 00000000..db68b4a9 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ep_yy.png differ 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 00000000..c9766c38 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/event_tdnd.png differ 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 00000000..eba44c33 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/gr_czw.png differ diff --git a/src/assets/img/shuju/fiveLayer/lwh.png b/src/assets/img/shuju/fiveLayer/lwh.png new file mode 100644 index 00000000..4143d8f0 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/lwh.png differ diff --git a/src/assets/img/shuju/fiveLayer/lyjlb.png b/src/assets/img/shuju/fiveLayer/lyjlb.png new file mode 100644 index 00000000..cc28870d Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/lyjlb.png differ diff --git a/src/assets/img/shuju/fiveLayer/other.png b/src/assets/img/shuju/fiveLayer/other.png new file mode 100644 index 00000000..d4f87d06 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/other.png differ 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 00000000..61a89798 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ps_jjz.png differ 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 00000000..296aff25 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ps_lyy.png differ diff --git a/src/assets/img/shuju/fiveLayer/ps_mzb.png b/src/assets/img/shuju/fiveLayer/ps_mzb.png new file mode 100644 index 00000000..dff31c44 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ps_mzb.png differ 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 00000000..553ee6ae Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ps_wss.png differ diff --git a/src/assets/img/shuju/fiveLayer/ps_zs.png b/src/assets/img/shuju/fiveLayer/ps_zs.png new file mode 100644 index 00000000..6d7f918e Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/ps_zs.png differ 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 00000000..36bb695e Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/pu_jgzsbm.png differ diff --git a/src/assets/img/shuju/fiveLayer/resi_snry.png b/src/assets/img/shuju/fiveLayer/resi_snry.png new file mode 100644 index 00000000..97fe7a48 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/resi_snry.png differ diff --git a/src/assets/img/shuju/fiveLayer/resi_szry.png b/src/assets/img/shuju/fiveLayer/resi_szry.png new file mode 100644 index 00000000..36a14505 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/resi_szry.png differ diff --git a/src/assets/img/shuju/fiveLayer/resi_xfry.png b/src/assets/img/shuju/fiveLayer/resi_xfry.png new file mode 100644 index 00000000..debac9fb Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/resi_xfry.png differ diff --git a/src/assets/img/shuju/fiveLayer/shequjiaozheng.png b/src/assets/img/shuju/fiveLayer/shequjiaozheng.png new file mode 100644 index 00000000..f610ffd8 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/shequjiaozheng.png differ diff --git a/src/assets/img/shuju/fiveLayer/sr_djc.png b/src/assets/img/shuju/fiveLayer/sr_djc.png new file mode 100644 index 00000000..7b1cbd2e Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/sr_djc.png differ 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 00000000..c5a00bb7 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/sr_gc.png differ 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 00000000..d620733a Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/sr_ggld.png differ 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 00000000..4ea25b07 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/sr_gy.png differ 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 00000000..7b1cbd2e Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/sr_jzz.png differ 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 00000000..5a3bb943 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/sr_rfqck.png differ 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 00000000..c9726404 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/sr_tyc.png differ diff --git a/src/assets/img/shuju/fiveLayer/sr_xfz.png b/src/assets/img/shuju/fiveLayer/sr_xfz.png new file mode 100644 index 00000000..a8718af5 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/sr_xfz.png differ 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 00000000..5609cfc7 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/sr_yjy.png differ diff --git a/src/assets/img/shuju/fiveLayer/whdw.png b/src/assets/img/shuju/fiveLayer/whdw.png new file mode 100644 index 00000000..df92ad39 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/whdw.png differ diff --git a/src/assets/img/shuju/fiveLayer/xidurenyuan.png b/src/assets/img/shuju/fiveLayer/xidurenyuan.png new file mode 100644 index 00000000..8115698b Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/xidurenyuan.png differ diff --git a/src/assets/img/shuju/fiveLayer/xiejiaorenyuan.png b/src/assets/img/shuju/fiveLayer/xiejiaorenyuan.png new file mode 100644 index 00000000..e5c1ed8e Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/xiejiaorenyuan.png differ diff --git a/src/assets/img/shuju/fiveLayer/yjdw.png b/src/assets/img/shuju/fiveLayer/yjdw.png new file mode 100644 index 00000000..830c5c79 Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/yjdw.png differ diff --git a/src/assets/img/shuju/fiveLayer/zaxld.png b/src/assets/img/shuju/fiveLayer/zaxld.png new file mode 100644 index 00000000..9c3a9c6b Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/zaxld.png differ diff --git a/src/assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png b/src/assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png new file mode 100644 index 00000000..046f20fd Binary files /dev/null and b/src/assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png differ diff --git a/src/assets/img/shuju/weixuan.png b/src/assets/img/shuju/weixuan.png new file mode 100644 index 00000000..90ab7f0d Binary files /dev/null and b/src/assets/img/shuju/weixuan.png differ diff --git a/src/assets/img/shuju/xuanzhong.png b/src/assets/img/shuju/xuanzhong.png new file mode 100644 index 00000000..698dbc50 Binary files /dev/null and b/src/assets/img/shuju/xuanzhong.png differ 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/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss new file mode 100644 index 00000000..ed0ffedd --- /dev/null +++ b/src/assets/scss/modules/visual/fiveLayerMap.scss @@ -0,0 +1,628 @@ +@import "../../c/config"; +@import "../../c/function"; +@import "./c/common"; +.div_top { + margin-left: 10px; + height: 35px; + .router_line { + width: 212px; + height: 1px; + border: 1px solid #ffffff; + opacity: 0.09; + /* opacity: 0.09; */ + } + .div_router { + margin-top: 5px; + font-size: 16px; + + .router_parents { + color: #a0c3d9; + + .arrow { + padding: 0 5px; + } + } + .router_parents:hover { + cursor: pointer; + } + + .router_child { + color: #ffffff; + } + } +} + +.div_content { + display: flex; + + .div_map { + box-sizing: border-box; + width: 100%; + // padding: 10px 5px 13px; + // margin-top: 8px; + height: calc(88vh - 15px); + color: #fff; + // background: url('../../../img/modules/visual/warning-box.png') no-repeat + // center; + // background-size: 100% 100%; + position: relative; + } + + .div_data { + flex: 0 0 610px; + margin-left: 12px; + + .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 10px 32px 10px; + 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_category { + box-sizing: border-box; + height:238px; + padding:0 10px 20px; + + .category_item { + + margin-bottom: 15px; + display: flex; + justify-content: flex-start; + align-items: center; + // margin:auto; + + + .list_item { + display: flex; + // padding: 18px 59px 0; + justify-content: flex-start; + flex:0 0 145px; + align-items: center; + + > img { + height: 16px; + width: 16px; + + // line-height: 25px; + } + .item_content{ + width:120px; + margin-left:8px; + font-size: 16px; + font-family: PingFang SC; + font-weight: 400; + + // line-height: 25px; + color: #e5effa; + } + + .item_content_sel{ + color: #5da8fd; + } + + } + + .list_item:hover{ + cursor: pointer; + } + + ::v-deep .el-popper { + padding: 0px; + } + // + + } + + + } + + .div_category { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; + } + } + + + } + + .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: 32px 21px 20px 20px; + + .div_search_list { + margin: 0 auto; + text-align: center; + width: 559px; + height: 48px; + background-color: #011168; + border-radius: 4px; + border: none; + box-shadow: 0 0 10px inset #1a5afd; + // border-radius: 8px; + display: flex; + justify-content: flex-end; + + .icon { + display: flex; + align-items: center; + margin-left: 29px; + margin-top: 14px; + + > img { + width: 20px; + height: 20px; + } + } + + .btn { + text-align: center; + flex: 0 0 113px; + 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: 48px; + } + .btn:hover { + cursor: pointer; + } + } + + + .tb { + height: calc(88vh - 302px - 10px - 150px); + 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; + } + } + + } + + + } +} + +.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/assets/scss/people-info.scss b/src/assets/scss/people-info.scss index f54b2e24..b0aca9ec 100644 --- a/src/assets/scss/people-info.scss +++ b/src/assets/scss/people-info.scss @@ -66,6 +66,10 @@ line-height: 24px; margin: 15px 0; + &.z-long { + width: 100%; + } + &::before { position: absolute; left: 0; diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue index 2433e227..8f564f37 100644 --- a/src/views/modules/base/community/roomForm.vue +++ b/src/views/modules/base/community/roomForm.vue @@ -11,7 +11,7 @@ - {{ agencyObj.neighborHoodName }}{{agencyObj.label}} + {{ dataForm.neighborHoodName }}{{dataForm.buildingName}} { this.$refs.ref_form.initForm('add', null) diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index ea0915d5..efd2c776 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -258,7 +258,7 @@ export default { latitude: 120.38945519 //纬度 }, serviceList: [], - gridLists: [], + // gridList: [], agencyId: '' } @@ -304,7 +304,7 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { - this.gridLists = data + this.gridList = data } else { this.$message.error(msg) @@ -376,24 +376,11 @@ export default { }) }, - dormatHtml(content) { - let c = '' - if (content.indexOf('DOCTYPE') != -1) { - c = content.slice(45, -16); - } - console.log('content', typeof content) - return c || content - }, async addActivity () { let url = '/heart/icpartyactivity/save' // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save" - if (this.formData.content) { - this.formData.content = this.dormatHtml(this.formData.content) - } - if (this.formData.result) { - this.formData.result = this.dormatHtml(this.formData.result) - } - + + const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue index fb1e16b0..c3fd4bb3 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue @@ -140,7 +140,7 @@ >查询
-
+
经度 { - this.handleMoveCenter(); + map.on("panend", (e) => { + this.handleMoveCenter(e); }); - this.handleMoveCenter(); + // this.handleMoveCenter(); }, setMarker(lat, lng) { @@ -505,7 +513,7 @@ export default { }); }, - handleMoveCenter() { + handleMoveCenter(e) { //修改地图中心点 const center = map.getCenter(); const lat = center.getLat(); @@ -513,6 +521,14 @@ export default { this.dataForm.latitude = lat; this.dataForm.longitude = lng; this.setMarker(lat, lng); + + if (e && e.originalEvent) { + geocoder + .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址 + .then((result) => { + this.dataForm.locationAddress = result.result.address; + }); + } }, async initForm(type, row) { diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue index 10929b97..dd59b13b 100644 --- a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue +++ b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue @@ -30,7 +30,7 @@ > -
{{ fmData.serviceTypeName }}
+
{{ fmData.serviceTypeName }}
-
{{ fmData.orgName || "--" }}
+
{{ fmData.orgName || "--" }}
-
{{ fmData.orgDescribe || "--" }}
+
+ {{ fmData.orgDescribe || "--" }} +
-
{{ fmData.principalName || "--" }}
+
+ {{ fmData.principalName || "--" }} +
-
{{ fmData.principalMobile || "--" }}
+
+ {{ fmData.principalMobile || "--" }} +
-
{{ fmData.remark || "--" }}
+
{{ fmData.remark || "--" }}
@@ -188,6 +194,7 @@ import { mapGetters } from "vuex"; import { requestPost } from "@/js/dai/request"; import formVltHelper from "dai-js/tools/formVltHelper"; +import nextTick from "dai-js/tools/nextTick"; var map; var search; @@ -288,8 +295,8 @@ export default { geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类 // 监听地图平移结束 - map.on("panend", () => { - this.handleMoveCenter(); + map.on("panend", (e) => { + this.handleMoveCenter(e); }); this.handleMoveCenter(); }, @@ -336,7 +343,7 @@ export default { }); }, - handleMoveCenter() { + handleMoveCenter(e) { //修改地图中心点 const center = map.getCenter(); const lat = center.getLat(); @@ -345,11 +352,13 @@ export default { this.fmData.longitude = lng; this.setMarker(lat, lng); - geocoder - .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址 - .then((result) => { - this.fmData.address = result.result.address; - }); + if (e && e.originalEvent) { + geocoder + .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址 + .then((result) => { + this.fmData.address = result.result.address; + }); + } }, async getInfo() { @@ -366,7 +375,11 @@ export default { ...data, serviceTypeArr: data.serviceType.split(","), }; - map.setCenter(new TMap.LatLng(data.latitude, data.longitude)); + + await nextTick(800); + if (map) { + map.setCenter(new TMap.LatLng(data.latitude, data.longitude)); + } } else { this.$message.error(msg); } 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..820e98c5 100644 --- a/src/views/modules/communityService/ninePlaces/places/places.vue +++ b/src/views/modules/communityService/ninePlaces/places/places.vue @@ -5,88 +5,85 @@ :model="formData" ref="ref_searchform" :label-width="'100px'"> -
- - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + 查询 - + + + + + + + + 重置 -
+ v-model="formData.scale" + placeholder="请选择" + clearable> + + + + + + + + + + + + + + 查询 + 重置 +
@@ -151,12 +148,16 @@ class="operate"> + + + { + this.multipleSelection.push(element.icEventId) + }); + console.log(this.multipleSelection) + }, + async handleMarkDiffcult () { + const url = "/gov/project/icEvent/difficultpointevent" + + let params = { + icEventIdList: this.multipleSelection, + type: "1" + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + + this.$message.success('标记成功') + this.getTableData(); + } else { + this.$message.error(msg) + } + + }, + async handleCancalDiffcult () { + const url = "/gov/project/icEvent/difficultpointevent" + + let params = { + icEventIdList: this.multipleSelection, + type: "0" + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + + this.$message.success('取消标记成功') + this.getTableData(); + } else { + this.$message.error(msg) + } + }, handleSearch (val) { console.log(this.formData); diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue new file mode 100644 index 00000000..fcf55152 --- /dev/null +++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue @@ -0,0 +1,661 @@ + + + + diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue new file mode 100644 index 00000000..8a257829 --- /dev/null +++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue @@ -0,0 +1,249 @@ + + + + + + + diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue new file mode 100644 index 00000000..53de80d4 --- /dev/null +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -0,0 +1,450 @@ + + + + + + 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..2613427d --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue @@ -0,0 +1,179 @@ + + + + + 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..fa9b1d7c --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue @@ -0,0 +1,540 @@ + + + + + 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..b3af3507 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue @@ -0,0 +1,250 @@ + + + + + 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..fd24a1d1 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue @@ -0,0 +1,150 @@ + + + + + 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..58767a37 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue @@ -0,0 +1,879 @@ + + + + + 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/xidurenyuan.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuan.vue new file mode 100644 index 00000000..f55fba23 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuan.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 new file mode 100644 index 00000000..a9624c93 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue @@ -0,0 +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 @@ + + + + + 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 new file mode 100644 index 00000000..5535dc57 --- /dev/null +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -0,0 +1,1957 @@ + + + + + + + + + + + \ 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..2920ee64 100644 --- a/src/views/modules/visual/cpts/tb.vue +++ b/src/views/modules/visual/cpts/tb.vue @@ -1,68 +1,75 @@