diff --git a/bns/css/compreDisplay/homeCityJump.css b/bns/css/compreDisplay/homeCityJump.css
new file mode 100644
index 0000000..cfc5dbb
--- /dev/null
+++ b/bns/css/compreDisplay/homeCityJump.css
@@ -0,0 +1,590 @@
+html,
+body {
+ width: 100%;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ color: #fff;
+ font-size: 16px;
+ font-family: 'Alibaba PuHuiTi R';
+ letter-spacing: 1px;
+}
+
+.layout {
+ display: flex;
+ align-items: center;
+ justify-content: start;
+ box-sizing: border-box;
+}
+
+#content {
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
+ justify-content: space-between;
+}
+
+.main-box {
+ height: 100%;
+ padding: 1% 0.5% 0 0.45%;
+ box-sizing: border-box;
+}
+
+/* 左侧样式 start */
+#left-box {
+ width: 37%;
+
+}
+
+#echarts-map {
+ width: 100%;
+ height: 96vh;
+}
+
+#check-risk {
+ width: 150PX;
+ height: 200px;
+ position: absolute;
+ top: 3%;
+ flex-direction: column;
+ justify-content: space-between;
+ z-index: 9999;
+}
+
+.check-risk {
+ width: 100%;
+ height: 50px;
+ justify-content: flex-end;
+ cursor: pointer;
+ font-size: 14px;
+}
+
+
+
+.check-risk img {
+ width: 18px;
+ height: 18px;
+}
+
+.check-risk p {
+ width: calc(90% - 25px);
+ margin-left: 10px;
+}
+
+.map-p {
+ color: #fff;
+ font-weight: normal;
+ margin-bottom: 10px;
+ font-size: 16px;
+ font-family: 'Alibaba PuHuiTi R';
+}
+
+/* 左侧样式 end */
+/* 中部样式 start */
+#center-box {
+ width: 34%;
+ flex-direction: column;
+}
+
+.module-title {
+ width: 100%;
+ height: 40px;
+ margin-bottom: 10px;
+ background: url("../../img/cityHome/module_title_gs.png") no-repeat 0 0 / 100% 100%;
+}
+
+.other-title {
+ width: 49%;
+}
+
+.module-title p {
+ font-size: 18px;
+ margin: -5px 0 0 6px;
+}
+
+/* 工程统计 start */
+#center-top {
+ width: 100%;
+ height: 38%;
+ justify-content: space-between;
+}
+
+#pro-box,
+#ticket-box {
+ width: 49%;
+ height: 100%;
+}
+
+#pro-info {
+ width: 100%;
+ height: calc(100% - 50px);
+ flex-direction: column;
+ justify-content: space-evenly;
+}
+
+.pro-div {
+ width: 100%;
+ height: 40%;
+}
+
+#pro-info .pro-div:nth-child(1) {
+ justify-content: center;
+}
+
+#pro-info .pro-div:nth-child(2) {
+ justify-content: space-between;
+ height: 47%;
+}
+
+.pro-common {
+ width: 31%;
+ height: 100%;
+ background-size: unset !important;
+ background-position: center center !important;
+ flex-direction: column;
+ justify-content: center;
+}
+
+.pro-common p:nth-child(1) {
+ font-size: 30px;
+ font-family: 'zcoolqingkehuangyouti';
+}
+
+#zj {
+ width: 51%;
+ background: url("../../img/cityHome/zj.png") no-repeat 0 0 / 100% 100%;
+}
+
+#zs {
+ background: url("../../img/cityHome/zs.png") no-repeat 0 0 / 100% 100%;
+}
+
+#tg {
+ background: url("../../img/cityHome/tg.png") no-repeat 0 0 / 100% 100%;
+}
+
+
+#wg {
+ background: url("../../img/cityHome/wg.png") no-repeat 0 0 / 100% 100%;
+}
+
+/* 工程统计 end */
+/* 作业票 start */
+#ticket-info {
+ width: 100%;
+ height: calc(100% - 50px);
+ flex-direction: column;
+ justify-content: space-evenly;
+}
+
+.ticket-div {
+ width: 100%;
+ height: 40%;
+ background: url("../../img/cityHome/ticket.png") no-repeat 0 0 / 100% 100%;
+ background-size: unset !important;
+ background-position: center center !important;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+}
+
+.ticket-div p:nth-child(2) {
+ font-size: 30px;
+ font-family: 'zcoolqingkehuangyouti';
+}
+
+/* 作业票 end */
+/* 风险情况 start */
+#center-center {
+ width: 100%;
+ height: 20%;
+}
+
+#risk-info {
+ width: 100%;
+ height: calc(100% - 50px);
+ justify-content: space-evenly;
+}
+
+.risk-div {
+ width: 24%;
+ height: 100%;
+ flex-direction: column;
+ justify-content: center;
+}
+
+.number-box {
+ width: 100%;
+ height: 60%;
+ justify-content: space-evenly;
+}
+
+.content-item {
+ width: 49px;
+ height: 56px;
+ text-align: center;
+ line-height: 56px;
+ font-size: 40px;
+ font-family: 'zcoolqingkehuangyouti';
+ background-size: unset !important;
+ background-position: center center !important;
+}
+
+#rollNumberList2 .content-item {
+ background: url("../../img/cityHome/two_new.png") no-repeat 0 0 / 100% 100%;
+}
+
+#rollNumberList3 .content-item {
+ background: url("../../img/cityHome/three.png") no-repeat 0 0 / 100% 100%;
+}
+
+#rollNumberList4 .content-item {
+ background: url("../../img/cityHome/four.png") no-repeat 0 0 / 100% 100%;
+}
+
+#rollNumberList5 .content-item {
+ background: url("../../img/cityHome/five.png") no-repeat 0 0 / 100% 100%;
+}
+
+.content-item+.content-item {
+ margin-left: 4px;
+}
+
+/* 风险情况 end */
+
+/* 其他 start */
+#center-bottom {
+ width: 100%;
+ height: 42%;
+}
+
+#other-info {
+ width: 100%;
+ height: calc(100% - 50px);
+ justify-content: space-evenly;
+}
+
+#other-module {
+ width: 15%;
+ height: 100%;
+}
+
+#other-echarts {
+ width: 83%;
+ height: 100%;
+}
+
+#other-module ul {
+ width: 100%;
+ height: 99%;
+ flex-direction: column;
+ justify-content: center;
+}
+
+#other-module ul li {
+ width: 100%;
+ height: 50px;
+ justify-content: center;
+ cursor: pointer;
+ background: url("../../img/cityHome/label_no_checked.png") no-repeat 0 0 / 100% 100%;
+ background-size: unset !important;
+ background-position: center center !important;
+}
+
+#other-module ul li:nth-child(1) {
+ background: url("../../img/cityHome/label_checked.png") no-repeat 0 0 / 100% 100%;
+}
+
+#other-module ul li:hover {
+ background: url("../../img/cityHome/label_checked.png") no-repeat 0 0 / 100% 100%;
+}
+
+.other-div {
+ width: 100%;
+ height: 100%;
+ flex-direction: column;
+}
+
+#person-num,
+#team-num {
+ width: 100%;
+ height: 50px;
+ justify-content: space-between;
+}
+
+#team-num p span, .person-num-box p span{
+ font-size: 16px;
+}
+#person-num{
+ flex-direction: column;
+}
+.person-num-box{
+ width: 100%;
+ height: 50%;
+}
+.person-num-box p{
+ width: 24%;
+ margin-right: 1%;
+ font-size: 13px;
+}
+#person-echarts,
+#team-echarts {
+ width: 100%;
+ height: calc(100% - 50px);
+}
+
+#ticket-echarts,
+#risk-echarts {
+ width: 100%;
+ height: calc(100%);
+}
+
+/* 其他 end */
+
+/* 中部样式 end */
+/* 右侧样式 start */
+#right-box {
+ width: 28%;
+}
+
+/* 许可及销号 start */
+#right-top {
+ width: 100%;
+ height: 20%;
+ justify-content: space-between;
+}
+
+#xk-info {
+ width: 100%;
+ height: calc(100% - 50px);
+ justify-content: space-evenly;
+}
+
+.xk-div {
+ width: 24%;
+ height: 92%;
+ background-size: unset !important;
+ background-position: center center !important;
+ flex-direction: column;
+ justify-content: space-between;
+}
+
+.xk-div p:nth-child(1) {
+ font-size: 20px;
+}
+
+#yxk {
+ background: url("../../img/cityHome/yxk.png") no-repeat 0 0 / 100% 100%;
+ color: #0BDC8C;
+}
+
+#bxk {
+ background: url("../../img/cityHome/bxk.png") no-repeat 0 0 / 100% 100%;
+ color: #66FFFF;
+}
+
+#yxh {
+ background: url("../../img/cityHome/yxh.png") no-repeat 0 0 / 100% 100%;
+ color: #4AC4FE;
+}
+
+#wxh {
+ background: url("../../img/cityHome/wxh.png") no-repeat 0 0 / 100% 100%;
+ color: #C65CFF;
+}
+
+/* 许可及销号 end */
+/* 周计划 start */
+#right-center {
+ width: 100%;
+ height: 35%;
+ justify-content: space-between;
+ position: relative;
+}
+
+#weekPlan-echarts {
+ width: 100%;
+ height: calc(100% - 50px);
+}
+
+#weekPlan-div {
+ width: 140px;
+ height: 68px;
+ position: absolute;
+ top: 15%;
+ left: 73%;
+ flex-direction: column;
+ justify-content: center;
+ background: url("../../img/cityHome/light.png") no-repeat 0 0 / 100% 100%;
+ background-size: unset !important;
+ background-position: center center !important;
+}
+
+#weekPlan-div p:nth-child(1) {
+ font-size: 30px;
+ font-family: 'zcoolqingkehuangyouti';
+}
+
+/* 周计划 end */
+
+/* 预警信息 start */
+#right-bottom {
+ width: 100%;
+ height: 45%;
+ justify-content: space-between;
+}
+
+#early-info {
+ width: 100%;
+ height: calc(100% - 50px);
+ justify-content: space-between;
+}
+
+#early-module {
+ width: 24%;
+ height: 100%;
+}
+
+#early-table {
+ width: 75%;
+ height: 100%;
+}
+
+#early-module ul {
+ width: 100%;
+ height: 99%;
+ flex-direction: column;
+ justify-content: center;
+}
+
+#early-module ul li {
+ width: 100%;
+ height: 50px;
+ justify-content: center;
+ cursor: pointer;
+ background: url("../../img/cityHome/label_no_checked.png") no-repeat 0 0 / 100% 100%;
+ background-size: unset !important;
+ background-position: center center !important;
+}
+
+#early-module ul li:nth-child(1) {
+ background: url("../../img/cityHome/label_checked.png") no-repeat 0 0 / 100% 100%;
+}
+
+#early-module ul li:hover {
+ background: url("../../img/cityHome/label_checked.png") no-repeat 0 0 / 100% 100%;
+}
+
+#early-ul {
+ width: 100%;
+ height: 100%;
+ overflow-y: auto;
+}
+
+#early-ul li {
+ width: calc(100% - 5px);
+ height: 40px;
+ margin-bottom: 5px;
+ background-size: unset !important;
+ background-position: center center !important;
+ background: url("../../img/cityHome/early_back.png") no-repeat 0 0 / 100% 100%;
+}
+
+.li-child {
+ width: 50%;
+ height: 100%;
+ justify-content: center;
+}
+.li-child:nth-child(1) {
+ width: 65%;
+}
+.li-child:nth-child(2) {
+ width: 35%;
+}
+.li-child p {
+ width: 80%;
+ font-size: 14px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ text-align: center;
+}
+
+li:nth-child(1) p {
+ font-size: 16px;
+}
+
+.early-module {
+ position: relative;
+ /* display: inline-block; */
+}
+
+.early-module::after {
+ content: attr(data-notification);
+ /* 使用伪元素的content属性获取通知数量 */
+ position: absolute;
+ top: 0;
+ right: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 20px;
+ height: 20px;
+ background-color: #FF5D5D;
+ color: white;
+ border-radius: 50%;
+ font-size: 12px;
+ opacity: 0.7;
+}
+
+/* 预警信息 end */
+/* 右侧样式 end */
+
+/*滚动条样式start*/
+
+/* ::-webkit-scrollbar {
+ width: 5px;
+ height: 10px;
+}
+
+::-webkit-scrollbar-track {
+ background: #e7e7f1 !important;
+ border-radius: 0px;
+}
+
+::-webkit-scrollbar-thumb {
+ background: rgba(94, 96, 97, 0.43) !important;
+ border-radius: 0px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+ background: rgba(94, 96, 97, 0.43) !important;
+ border-radius: 0px;
+}
+
+::-webkit-scrollbar-thumb:active {
+ background: rgba(94, 96, 97, 0.43) !important;
+ border-radius: 0px;
+} */
+::-webkit-scrollbar {
+ width: 10px;
+ height: 10px;
+}
+::-webkit-scrollbar-thumb:hover {
+ background: #dadee8;
+ cursor: pointer;
+}
+
+::-webkit-scrollbar-thumb {
+ border-radius: 14px;
+ border-style: dashed;
+ border-color: transparent;
+ border-width: 1px;
+ background-color: #dadee8;
+ background-clip: padding-box;
+}
+
+::-webkit-scrollbar-corner {
+ background-color: transparent;
+}
+/*滚动条样式end*/
\ No newline at end of file
diff --git a/bns/html/compreDisplay/cityHomeJump.html b/bns/html/compreDisplay/cityHomeJump.html
new file mode 100644
index 0000000..3f57cba
--- /dev/null
+++ b/bns/html/compreDisplay/cityHomeJump.html
@@ -0,0 +1,274 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 地市首页
+
+
+
+
+
+
+
+
+
+
+
+
全选(0)
+
+
+
二级(0)
+
+
+
三级(0)
+
+
+
四级(0)
+
+
+
五级(0)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - 人员情况
+
+ - 队伍情况
+
+ - 作业票趋势
+
+ - 风险趋势
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - 今日无施工
+ - 新进班组
+ - 七日无施工
+ - 人数变化大
+ - 工序变化
+
+ - 球机异常
+
+
+
+
+
+
+
'+item.name+'：'+item.value+'人
';
+ }else{
+ cent += ''+item.name+'：'+item.value+'人
';
+ }
+ })
+ $('.person-num-box').eq(0).empty().html(html);
+ $('.person-num-box').eq(1).empty().html(cent);
+ initEchartsOne(obj.time, obj.nums);
+ } else if (type === '2') {
+ $('#teamNum').html(obj.today);
+ initEchartsTwo(obj.time, obj.nums);
+ } else if (type === '3') {
+ console.log(obj);
+ initEchartsThree(obj.time, obj.ANum, obj.BNum);
+ } else if (type === '4') {
+ initEchartsFour(obj.time, obj.twoRisk, obj.threeRisk, obj.fourRisk, obj.fiveRisk);
+ }
+ }
+}
+
+// 作业许可及销号
+function loadXHNumAjax() {
+ let url = dataUrl + 'proteam/pot/city/getTicketXhMaps';
+ let params = {
+ 'isSup': user.isSup,
+ 'orgId': user.orgId
+ };
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ if (result.code === 200) {
+ setXHNum(result);
+ } else if (result.code === 500) {
+ layer.alert(result.msg, { icon: 2 })
+ } else if (result.code === 401) {
+ logout(1);
+ }
+ }, function (xhr) {
+
+ });
+
+ // 作业许可及销号数量赋值
+ function setXHNum(obj) {
+ $('#yxkNum').html(obj.permit);
+ $('#bxkNum').html(obj.notPermit);
+ $('#yxhNum').html(obj.cancel);
+ $('#wxhNum').html(obj.notCancel);
+ }
+}
+
+// 周计划
+function loadWeekPlanAjax() {
+ let url = dataUrl + 'proteam/pot/city/getWeekPlanMaps';
+ let params = {
+ 'isSup': user.isSup,
+ 'orgId': user.orgId
+ };
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ if (result.code === 200) {
+
+ let obj = result;
+ initEchartsFive(obj.twoRisk, obj.threeRisk, obj.foureRisk, obj.fiveRisk);
+ let planNum = result.planNum;
+ $('#weekPlanNum').html(planNum);
+
+ } else if (result.code === 500) {
+ initEchartsFive(0, 0, 0, 0);
+ layer.alert(result.msg, { icon: 2 })
+ } else if (result.code === 401) {
+ logout(1);
+ }
+ }, function (xhr) {
+ initEchartsFive(0, 0, 0, 0);
+ });
+}
+
+// 预警提醒数量
+function loadEarlyNumAjax() {
+ let url = dataUrl + 'proteam/pot/city/getEarMaps';
+ let params = {
+ 'isSup': user.isSup,
+ 'currentUserOrgId': user.orgId,
+ 'currentUserId':user.currentUserId
+ };
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ if (result.code === 200) {
+ setEarlyNumByType(result);
+ } else if (result.code === 500) {
+ layer.alert(result.msg, { icon: 2 })
+ setEarlyNumByType(null);
+ } else if (result.code === 401) {
+ logout(1);
+ }
+ }, function (xhr) {
+ setEarlyNumByType(null);
+ });
+
+ // 预警提醒数量赋值
+ function setEarlyNumByType(data) {
+ if (data) {
+
+ document.querySelector('#early-module' + (1) + '').setAttribute('data-notification', data.one);
+ document.querySelector('#early-module' + (2) + '').setAttribute('data-notification', data.two);
+ document.querySelector('#early-module' + (3) + '').setAttribute('data-notification', data.three);
+ document.querySelector('#early-module' + (4) + '').setAttribute('data-notification', data.four);
+ document.querySelector('#early-module' + (5) + '').setAttribute('data-notification', data.five);
+ // document.querySelector('#early-module' + (6) + '').setAttribute('data-notification', data.six);
+ document.querySelector('#early-module' + (7) + '').setAttribute('data-notification', data.seven);
+
+ } else {
+ for (let i = 1; i <= 7; i++) {
+ let earlyModule = document.querySelector('#early-module' + (i) + '');
+ earlyModule.setAttribute('data-notification', 0);
+ }
+ }
+ }
+}
+
+// 预警提醒
+function loadEarlyAjax(type) {
+ let url = dataUrl + 'proteam/pot/early/getNoWorkByDay';
+ if (type === '1') { // 今日无施工
+ url = dataUrl + 'proteam/pot/early/getNoWorkByDay';
+ } else if (type === '2') { // 新进班组
+ url = dataUrl + 'proteam/pot/early/getNewTeam';
+ } else if (type === '3') { // 七日无施工
+ url = dataUrl + 'proteam/pot/early/getNoWorkBySeven';
+ } else if (type === '4') { // 人数变化大
+ url = dataUrl + 'proteam/pot/early/getTeamByPer';
+ } else if (type === '5') { // 工序变化
+ url = dataUrl + 'proteam/pot/early/getTeamByWork';
+ } else if (type === '6') { // 作业类型
+ url = dataUrl + 'proteam/pot/early/getTeamByJob';
+ } else if (type === '7') { // 球机异常
+ url = dataUrl + 'proteam/pot/early/getBallByUnusual';
+ }
+ let params = {
+ 'isSup': user.isSup,
+ 'currentUserOrgId': user.orgId,
+ 'currentUserId':user.currentUserId,
+ 'pageNum': 1,
+ 'pageSize': 10000,
+ };
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ if (result.code === 200) {
+ setEarlyDataByType(result.rows);
+ } else if (result.code === 500) {
+ layer.alert(result.msg, { icon: 2 })
+ setEarlyDataByType(null);
+ } else if (result.code === 401) {
+ logout(1);
+ }
+ }, function (xhr) {
+ setEarlyDataByType(null);
+ });
+
+ // 预警提醒赋值
+ function setEarlyDataByType(dataList) {
+ $('#early-ul li:not(:first)').remove();
+ let html = '';
+ if (dataList && dataList.length > 0) {
+ $.each(dataList, function (index, item) {
+ html += '' +
+ '' +
+ '' + (item.fzrName + '
' +isNull(item.phone)) + '
${option.series[params.seriesIndex].pieData.value + "条"
+ }`;
+ }
+ },
+ backgroundColor: 'rgba(0, 0, 0, 0.63)', //设置背景颜色
+ textStyle: {
+ color: fontColor,
+ fontFamily: fontFamily
+ },
+ borderColor: "rgba(255,255,255, .5)",
+ },
+ title: {
+ x: "center",
+ top: "20",
+ textStyle: {
+ color: "#fff",
+ fontSize: 22,
+ },
+ },
+ backgroundColor: "transparent",
+ labelLine: {
+ show: true,
+ lineStyle: {
+ color: "#7BC0CB",
+ },
+ normal: {
+ show: true,
+ length: 10,
+ length2: 10,
+ },
+ },
+ label: {
+ show: true,
+ position: "outside",
+ formatter: "{b} \n{d}%",
+ textStyle: {
+ color: "#fff",
+ fontSize: "14px",
+ fontFamily: fontFamily
+ },
+ },
+ xAxis3D: {
+ min: -1,
+ max: 1,
+ },
+ yAxis3D: {
+ min: -1,
+ max: 1,
+ },
+ zAxis3D: {
+ min: -1,
+ max: 1,
+ },
+ grid3D: {
+ show: false,
+ boxHeight: 2,
+ //top: '30%',
+ left: '4%',
+ bottom: "50%",
+ // environment: "rgba(255,255,255,0)",
+ viewControl: {
+ distance: 320,
+ alpha: 30,
+ beta: 20,
+ autoRotate: true, // 自动旋转
+ },
+ },
+ series: series,
+ };
+ myChart6.setOption(option);
+ window.addEventListener("resize", function () {
+ myChart6.resize();
+ });
+}
\ No newline at end of file
diff --git a/bns/js/compreDisplay/cityHomeJump/cityHomeEchartsMap.js b/bns/js/compreDisplay/cityHomeJump/cityHomeEchartsMap.js
new file mode 100644
index 0000000..38d0950
--- /dev/null
+++ b/bns/js/compreDisplay/cityHomeJump/cityHomeEchartsMap.js
@@ -0,0 +1,204 @@
+//在div中初始化地图
+let uploadedDataURL2 = "../../../js/compreDisplay/anhui/changchun.json";
+echarts.init(document.getElementById('echarts-map')).dispose();
+let myChart2 = null;
+
+/**
+ * 加载地图
+ * @param dataMap
+ */
+function map2(dataMap) {
+ $.getJSON(uploadedDataURL2, function (geoJson) {
+ echarts.registerMap('anhui', geoJson);
+ myChart.hideLoading();
+ let max = 480,
+ min = 1.25; // todo
+ let maxSize4Pin = 100,
+ minSize4Pin = 100;
+
+ let convertData = function (data) {
+ let res = [];
+ for (let i = 0; i < data.length; i++) {
+ let geoCoord = data[i].coordinate;
+ if (geoCoord) {
+ res.push({
+ proName: data[i].proName,
+ riskLevel: data[i].riskType,
+ workContent: dealEmptyString(data[i].workContent),
+ isOnline: isOnline(data[i].ballStatus),
+ workManager: dealEmptyString(data[i].workManage) + '' + dealEmptyString(data[i].workManagePhone),
+ value: geoCoord.concat(data[i].value),
+ coordinate: data[i].coordinate,
+ });
+ }
+ }
+ return res;
+ };
+
+ let option = {
+ silent: false,
+ backgroundColor: 'transparent',
+ textStyle: {
+ fontSize: 16,
+ fontWeight: 'bold',
+ color: 'red'
+ },
+ tooltip: {
+ trigger: 'item',
+ enterable: true,
+ position: function (pos, params, dom, rect, size) {
+ if ($(dom).children($('p')).length === 0) $(dom).css('display', 'none')
+ pos = [pos[0], pos[1] + 10];
+ return pos;
+ },
+ backgroundColor: 'rgba(14, 17, 28,0.63)', //设置背景颜色
+ textStyle: {
+ color: '#fff'
+ },
+ borderColor: "#174FDD",
+ formatter: function (params) {
+ if (params.data)
+ return (
+ '' + params.data.proName + '
' +
+ '风险等级：' + setRiskLevelColor(params.data.riskLevel) + '
' +
+ '作业内容：' + sliceStr(params.data.workContent) + '
' +
+ '班组长：' + params.data.workManager + '
' +
+ '球机：' + params.data.isOnline + '
'
+ )
+ },
+ // extraCssText: "background:url('../../img/tc.png') 100% 100% repeat;",
+ extraCssText: "max-width:300px;height:auto;word-break:break-all;white-space:pre-wrap;",
+
+ },
+ geo: {
+ show: true,
+ map: 'anhui',
+ aspectScale: 0.8,
+ label: {
+ normal: {
+ show: true,
+ textStyle: {
+ color: '#fff',
+ fontFamily: 'Alibaba PuHuiTi R',
+ fontSize: 11,
+ // position: 'top',
+ // offset: [-10, 0]
+ },
+ // rotate: -20,
+ },
+ emphasis: {
+ show: true,
+ }
+ },
+ roam: false,
+ scaleLimit: {
+ max: max,
+ min: min
+ },
+ itemStyle: {
+ normal: {
+ areaColor: '#52ADF3',
+ borderColor: '#fff',
+ borderWidth: 2,
+ shadowColor: 'rgba(80, 172, 243, 0.5)',
+ shadowBlur: 30
+ },
+ emphasis: {
+ areaColor: '#2B91B7',
+ }
+ },
+ tooltip: {
+ show: true
+ }
+ },
+ series: [{
+ name: '在线',
+ type: 'scatter',
+ coordinateSystem: 'geo',
+ animation: false,
+ symbolSize: function (val) {
+ let a = (maxSize4Pin - minSize4Pin) / (max - min);
+ let b = minSize4Pin - a * min;
+ b = maxSize4Pin - a * max;
+ return 20;
+ },
+ symbol: function (val) {
+ switch (val[2]) {
+ case 2:
+ return 'image://../../img/compreDisplay/two-risk.png';
+ break;
+ case 3:
+ return 'image://../../img/compreDisplay/three-risk.png';
+ break;
+ case 4:
+ return 'image://../../img/compreDisplay/four-risk.png';
+ break;
+ case 5:
+ return 'image://../../img/compreDisplay/five-risk.png';
+ break;
+ default:
+ break;
+ }
+ },
+ label: {
+ normal: {
+ show: false,
+ textStyle: {
+ color: '#fff',
+ fontSize: 15,
+ opacity: 1
+ }
+ }
+ },
+ zlevel: 6,
+ z: 6,
+ data: convertData(dataMap)
+ }
+ ]
+ }
+
+ myChart2.clear();
+ myChart2.setOption(option, true);
+ });
+ window.addEventListener("resize", function () {
+ myChart2.resize();
+ });
+}
+
+/*判空*/
+function dealEmptyString(str) {
+ if (str) {
+ return str;
+ }
+ return '';
+}
+
+// 超长设置隐藏
+function sliceStr(value) {
+ if (value) {
+ return value.length > 12 ? value.slice(0, 12) + '...' : value;
+ } else {
+ return '';
+ }
+}
+
+/*判断球机是否在线*/
+function isOnline(value) {
+ if (value) {
+ if (value === '0' || value === 0) {
+ return '离线';
+ } else {
+ return '在线';
+ }
+ } else {
+ return '离线';
+ }
+}
+
+// 地市地图
+function setCityMap(name, isSup, mapPointList) {
+ uploadedDataURL2 = '../../js/compreDisplay/anhui/changchun.json';
+
+ myChart2 = echarts.init(document.getElementById('echarts-map'));
+ map2(mapPointList);
+}
diff --git a/bns/js/compreDisplay/cityHomeJump/cityHomeStyle.js b/bns/js/compreDisplay/cityHomeJump/cityHomeStyle.js
new file mode 100644
index 0000000..f329bfc
--- /dev/null
+++ b/bns/js/compreDisplay/cityHomeJump/cityHomeStyle.js
@@ -0,0 +1,112 @@
+/*地图风险等级选中*/
+$(".check-risk").click(function (e) {
+ let checkedName = $(this).find('p').eq(0).attr("checkedName");
+ let isCheck = $(this).attr("isCheck");
+ if (checkedName === '' && isCheck === '1') {
+ $('.check-risk').each(function () {
+ if ($(this).attr("isCheck") === '1') {
+ $(this).attr("isCheck", '0')
+ let checkedValue = $(this).find('p').eq(0).attr("checkedName");
+ $(this).find('img').eq(0).attr("src", setRiskIcon(checkedValue, 1))
+ }
+ })
+ } else if (checkedName === '' && isCheck === '0') {
+ $('.check-risk').each(function () {
+ if ($(this).attr("isCheck") === '0') {
+ $(this).attr("isCheck", '1')
+ let checkedValue = $(this).find('p').eq(0).attr("checkedName");
+ $(this).find('img').eq(0).attr("src", setRiskIcon(checkedValue, 2))
+ }
+ })
+ } else if (checkedName !== '' && isCheck === '1') {
+ $(this).attr("isCheck", '0')
+ $(this).find('img').eq(0).attr("src", setRiskIcon(checkedName, 1))
+ } else if (checkedName !== '' && isCheck === '0') {
+ $(this).attr("isCheck", '1')
+ $(this).find('img').eq(0).attr("src", setRiskIcon(checkedName, 2))
+ }
+ mapSearch();
+ map2(mapPointList);
+});
+
+/*风险等级选中*/
+function mapSearch() {
+ let selRiskList = [];
+ mapPointList.splice(0, mapPointList.length);
+ $('.check-risk').each(function () {
+ if ($(this).attr("isCheck") === '1') {
+ if ($(this).find('p').eq(0).attr("checkedName")) {
+ selRiskList.push($(this).find('p').eq(0).attr("checkedName"))
+ }
+ }
+ })
+ if (selRiskList.length) {
+ $.each(selRiskList, function (index, item) {
+ let dataList = mainMapPointList.filter(item2 => {
+ return item2.riskType === item
+ })
+ $.each(dataList, function (index3, item3) {
+ mapPointList.push(item3)
+ })
+ })
+ }
+}
+
+// 设置风险等级选中样式
+function setRiskIcon(value, type) {
+ if (value && type === 1) {
+ return '../../img/title-btn/no-check/risk-' + value + '-nocheck.png';
+ } else if (!value && type === 1) {
+ return '../../img/title-btn/no-check/risk-1-nocheck.png';
+ } else if (value && type === 2) {
+ return '../../img/title-btn/check/risk-' + value + '-check.png';
+ } else if (!value && type === 2) {
+ return '../../img/title-btn/check/risk-1-check.png';
+ }
+}
+
+// 其他-选中标签模块
+function checkLabel(that, value, moduleValue) {
+ $('#other-module ul li').each(function (index, item) {
+ let labelValue = $(this).attr('labelValue'), isChecked = $(this).attr('isChecked');
+ if (value !== labelValue) {
+ $(this).css({ 'background': 'url("../../img/cityHome/label_no_checked.png") no-repeat 0 0 / 100% 100%' });
+ }
+ })
+ $(that).css('background', 'url("../../img/cityHome/label_checked.png") no-repeat 0 0 / 100% 100%');
+
+ $('#other-echarts .other-div').each(function (index, item) {
+ let moduleValue = $(this).attr('moduleValue');
+ if (value !== moduleValue) {
+ $(this).css({ 'display': 'none' });
+ }
+ })
+ myChart.dispose();
+ myChart3.dispose();
+ myChart4.dispose();
+ myChart5.dispose();
+ $('#other-' + moduleValue).css({ 'display': '' });
+ if (value === '1') {
+ myChart = echarts.init(document.getElementById('person-echarts'));
+ } else if (value === '2') {
+ myChart3 = echarts.init(document.getElementById('team-echarts'));
+ } else if (value === '3') {
+ myChart4 = echarts.init(document.getElementById('ticket-echarts'));
+ } else if (value === '4') {
+ myChart5 = echarts.init(document.getElementById('risk-echarts'));
+ }
+ loadOtherAjax(value);
+}
+
+
+// 预警提醒-选中标签模块
+function checkEarlyLabel(that, value) {
+ $('#early-module ul li').each(function (index, item) {
+ let labelValue = $(this).attr('labelValue');
+ if (value !== labelValue) {
+ $(this).css({ 'background': 'url("../../img/cityHome/label_no_checked.png") no-repeat 0 0 / 100% 100%' });
+ }
+ })
+ $(that).css('background', 'url("../../img/cityHome/label_checked.png") no-repeat 0 0 / 100% 100%');
+ loadEarlyAjax(value);
+}
\ No newline at end of file
diff --git a/bns/js/compreDisplay/map.js b/bns/js/compreDisplay/map.js
index 2084048..d48ca84 100644
--- a/bns/js/compreDisplay/map.js
+++ b/bns/js/compreDisplay/map.js
@@ -340,16 +340,18 @@ function map(dataMap) {
/*myChart.off('click').on('click', function (params) {
// openVideo(params.data)
});*/
- /* myChart.off('dblclick').on("dblclick", function (params) {
+ myChart.off('dblclick').on("dblclick", function (params) {
if(params.componentType === 'geo'){
- $('.switch-type').css('display', 'none');
+ /* $('.switch-type').css('display', 'none');
$('.switch-btn').css('display', 'none');
$('.switch-type2').removeAttr('style');
- $('.back').removeAttr('style');
+ $('.back').removeAttr('style'); */
console.log(params);
- setUploadedDataURL2(params.name);
+ if(params.name === '长春市'){
+ setUploadedDataURL2(params.name);
+ }
}
- }) */
+ })
});
window.addEventListener("resize", function () {
myChart.resize();
@@ -367,77 +369,12 @@ function sliceStr(value) {
// 省市下钻
function setUploadedDataURL2(name) {
- var orgs=getOrgSelect();
- for (let i = 0; i < orgs.length; i++) {
- var orgName=orgs[i].name +"市";
- var orgId=orgs[i].code;
- if(name==orgName){
- clickCityCode=orgId;
- }
- }
- console.log(name)
- if (name === "合肥市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/hefei.json';
- clickCityName = '安徽省电力公司合肥供电公司';
- } else if (name === "芜湖市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/wuhu.json';
- clickCityName = '安徽省电力公司芜湖供电公司';
- } else if (name === "蚌埠市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/bengbu.json';
- clickCityName = '安徽省电力公司蚌埠供电公司';
- } else if (name === "淮南市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/huainan.json';
- clickCityName = '安徽省电力公司淮南供电公司';
- } else if (name === "马鞍山市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/maansan.json';
- clickCityName = '安徽省电力公司马鞍山供电公司';
- } else if (name === "淮北市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/huaibei.json';
- clickCityName = '安徽省电力公司淮北供电公司';
- } else if (name === "铜陵市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/tongling.json';
- clickCityName = '安徽省电力公司铜陵供电公司';
- } else if (name === "安庆市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/anqing.json';
- clickCityName = '安徽省电力公司安庆供电公司';
- } else if (name === "黄山市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/huangshan.json';
- clickCityName = '安徽省电力公司黄山供电公司';
- } else if (name === "阜阳市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/fuyang.json';
- clickCityName = '安徽省电力公司阜阳供电公司';
- } else if (name === "宿州市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/suzhou.json';
- clickCityName = '安徽省电力公司宿州供电公司';
- } else if (name === "滁州市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/chuzhou.json';
- clickCityName = '安徽省电力公司滁州供电公司';
- } else if (name === "六安市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/liuan.json';
- clickCityName = '安徽省电力公司六安供电公司';
- } else if (name === "宣城市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/xuancheng.json';
- clickCityName = '安徽省电力公司宣城供电公司';
- } else if (name === "池州市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/chizhou.json';
- clickCityName = '安徽省电力公司池州供电公司';
- } else if (name === "亳州市") {
- uploadedDataURL2 = '../../js/compreDisplay/anhui/bozhou.json';
- clickCityName = '安徽省电力公司亳州供电公司';
- }
- map([]);
- myChart2 = echarts.init(document.getElementById('echarts-map2'));
- // map2([]);
- let dataList = mapPointList.filter(item => {
- if (item.buildCode === clickCityCode) {
- return item
- }
- })
- isCity = true;
- console.log(dataList);
- console.log(clickCityCode);
- map2(dataList);
- setCityData(clickCityCode);
+ sessionStorage.setItem('cityName', name);
+ sessionStorage.setItem('orgId', '07A0');
+ const activeTabItem = parent.document.querySelector('#ifr-box');
+ const frameId = activeTabItem.querySelector('iframe');
+ $(frameId).attr('src', '../compreDisplay/cityHomeJump.html')
+
}
//组织机构下拉选
diff --git a/bns/js/home/home.js b/bns/js/home/home.js
index 9d335ba..2ef8472 100644
--- a/bns/js/home/home.js
+++ b/bns/js/home/home.js
@@ -7,7 +7,8 @@ let isClose=false;
let kjIdx = 199999; // 课件学习索引
let bgStatus = "no-need"; // 报岗状态 need：需要报岗 no-need 不需要报岗
let layerIndex222 = null;
-
+sessionStorage.removeItem('cityName');
+sessionStorage.removeItem('orgId');
layui.use(['layer', 'form', 'element'], function () {
var $ = layui.jquery;
element = layui.element;