修改

bns/css/compreDisplay/compreDisplay.css

@@ -17,7 +17,7 @@ body {
 }
 
 #content-box {
-    width: 100%;
+    width: 99.56%;
     height: 100%;
     /*padding: 0.5% 0.5% 0 0.5%;*/
     box-sizing: border-box;
@@ -30,7 +30,8 @@ body {
 }
 
 #left {
-    width: 32.108%;
+    /* width: 32.108%; */
+    width: 24.108%;
     padding: 1% 0.5% 0 0.45%;
     z-index: 1000;
     justify-content: space-between;
@@ -38,7 +39,8 @@ body {
 }
 
 #left-box {
-    width: 77.016%;
+    /* width: 77.016%; */
+    width: 100%;
 }
 
 #left-box2 {
@@ -47,13 +49,13 @@ body {
 }
 
 #center-box {
-    width: 37.0901%;
+    width: 50.0901%;
     padding: 1% 0.5% 0 0.45%;
     position: relative;
 }
 
 #right {
-    width: 30.1045%;
+    width: 24.1045%;
     padding: 1% 0.5% 0 0.45%;
     z-index: 1000;
     justify-content: space-between;
@@ -66,7 +68,7 @@ body {
 }
 
 #right-box {
-    width: 82.32%;
+    width: 100%;
     z-index: 1000;
 }
 
@@ -215,7 +217,8 @@ body {
     width: 100%;
     height: 40px;
     margin-bottom: 10px;
-    background: url("../../img/compreDisplay/week-risk.png") no-repeat 0 0 / 100% 100%;
+    /* background: url("../../img/compreDisplay/week-risk.png") no-repeat 0 0 / 100% 100%; */
+    /* background: url("../../img/cityHome/module_title_gs.png") no-repeat 0 0 / 100% 100%; */
 }
 
 .main-box2-btn {
@@ -544,7 +547,7 @@ body {
     width: 100%;
     height: 40px;
     margin-bottom: 10px;
-    background: url("../../img/compreDisplay/ticket-title.png") no-repeat 0 0 / 100% 100%;
+    /* background: url("../../img/compreDisplay/ticket-title.png") no-repeat 0 0 / 100% 100%; */
 }
 
 .ticket {
@@ -646,7 +649,7 @@ body {
     width: 100%;
     height: 40px;
     margin-bottom: 10px;
-    background: url("../../img/compreDisplay/class_back.png") no-repeat 0 0 / 100% 100%;
+    /* background: url("../../img/compreDisplay/class_back.png") no-repeat 0 0 / 100% 100%; */
 }
 
 .ticket-bar {
@@ -666,7 +669,7 @@ body {
     width: 100%;
     height: 40px;
     margin-bottom: 10px;
-    background: url("../../img/compreDisplay/personnel-statistics.png") no-repeat 0 0 / 100% 100%;
+    /* background: url("../../img/compreDisplay/personnel-statistics.png") no-repeat 0 0 / 100% 100%; */
 }
 
 #echarts-six {
@@ -1060,12 +1063,12 @@ body .my-skin.child-skin {
 .plan-history-title {
     width: 100%;
     height: 40px;
-    background: url("../../img/cityHome/module_title.png") no-repeat 0 0 / 100% 100%;
+    background: url("../../img/compreDisplay/xiaobiaoti.png") no-repeat 0 0 / 100% 100%;
 }
 
 .plan-history-title>p {
     font-size: 20px;
-    margin: -5px 0 0 6px;
+    margin: -5px 0 0 35px;
 }
 
 #plan-echarts {
@@ -1143,7 +1146,7 @@ body .my-skin.child-skin {
     width: 100%;
     height: 40px;
     margin-bottom: 10px;
-    background: url("../../img/compreDisplay/early-info.png") no-repeat 0 0 / 100% 100%;
+    /* background: url("../../img/compreDisplay/early-info.png") no-repeat 0 0 / 100% 100%; */
 }
 
 .early-info-list {

bns/css/login.css

@@ -2,7 +2,7 @@ body{
     width: 99%;
     height: 100%;
     background-color: #0c0c0c;
-    background-image: url("../img/login/back.png")  ;
+    background-image: url("../img/back.png")  ;
 }
 
 #wdiv{

bns/html/compreDisplay/compreDisplay.html

@@ -47,7 +47,9 @@
                     </div>
                     <!--周风险-->
                     <div class="main-box2">
-                        <div class="main-box2-title"></div>
+                        <div class="main-box2-title plan-history-title">
+                            <p>周风险</p>
+                        </div>
                         <div class="main-box2-btn layout">
                             <div style="width: 150px;flex-direction: row" class="layout">
                                 <div class="legend-title layout" style="color: #DD690B;"><img style="margin-top: 0px"
@@ -121,7 +123,9 @@
                 </div>
                 <!-- 预警信息 -->
                 <div class="early-main-box">
-                    <div class="early-main-box-title"></div>
+                    <div class="early-main-box-title plan-history-title">
+                        <p>预警信息</p>
+                    </div>
                     <div class="early-info-list" onclick="openEarlyInfo()">
                         <ul>
                             <li class="layout"><p style="width: 40%;">预警信息共<span id="earlyTotalNum">0</span>条 </p><p style="width: 30%;">已处理<span id="earlyDealNum">0</span>条 </p><p style="width: 30%;">未处理<span id="earlyNoDealNum">0</span>条</p></li>
@@ -132,13 +136,13 @@
                     </div>
                 </div>
             </div>
-            <div id="left-box2" class="common-height">
+            <!-- <div id="left-box2" class="common-height">
                 <div class="switch-btn">
                     <form class="layui-form switch-form" onsubmit="return false;">
-                        <!--<div class="layui-form-item layout">
+                        <div class="layui-form-item layout">
                         <p>天气</p>
                         <input type="checkbox" name="weather" lay-skin="switch" lay-filter="weather" title="风险开关">
-                    </div>-->
+                    </div>
                         <div class="layui-form-item layout">
                             <p>地形</p>
                             <input type="checkbox" name="terrain" lay-skin="switch" lay-filter="terrain" title="地形">
@@ -180,7 +184,7 @@
                         <p>投产工程</p>
                     </div>
                 </div>
-            </div>
+            </div> -->
         </div>
         <div id="center-box" class="common-height">
             <div class="switch-type">
@@ -268,7 +272,7 @@
             </form>
         </div>
         <div id="right" class="layout common-height">
-            <div id="center-box2" class="common-height">
+            <!-- <div id="center-box2" class="common-height">
                 <div class="multiselect layout">
                     <div class="check-risk layout" isCheck='1'><img src="../../img/title-btn/check/risk-1-check.png">
                         <p checkedName="" style="color: #fff;">全选(<span id="allNum">0</span>)</p>
@@ -283,15 +287,14 @@
                             style="">
                         <p checkedName="4" style="color: #2aa998;">四级及以下(<span id="fourNum">0</span>)</p>
                     </div>
-                    <!--<div class="check-risk layout" isCheck='1'><img
+                    
-                        src="../../img/title-btn/check/risk-5-check.png">
-                    <p checkedName="5" style="color: #70e180;">五级</p></div>-->
-                </div>
                 </div>
+            </div> -->
             <div id="right-box" class="common-height">
                 <!--作业票-->
                 <div class="main-box3">
-                    <div class="main-box3-title">
+                    <div class="main-box3-title plan-history-title">
+                        <p>作业票</p>
                         <div class="change-type-btn3 layout">
                             <p class="change-type3 check-p" dateType="1">日</p>
                             <p class="change-type3" dateType="2">周</p>
@@ -324,7 +327,9 @@
                 </div>
                 <!--站班会-->
                 <div class="main-box5">
-                    <div class="main-box5-title"></div>
+                    <div class="main-box5-title plan-history-title">
+                        <p>站班会</p>
+                    </div>
                     <div class="ticket-bar">
                         <div class="ticket-bar-btn layout">
                             <div class="date3-btn layout">
@@ -355,7 +360,9 @@
                 </div>
                 <!--人员统计-->
                 <div class="main-box4">
-                    <div class="main-box4-title" onclick="openPersonnelStatistics('')"></div>
+                    <div class="main-box4-title plan-history-title" onclick="openPersonnelStatistics('')">
+                        <p>人员统计</p>
+                    </div>
                     <div id="echarts-six"></div>
                 </div>
             </div>

bns/js/compreDisplay/map.js

@@ -1,6 +1,7 @@
 //在div中初始化地图
 // /let myChart = echarts.init(document.getElementById('map-content'));
-let uploadedDataURL = "../../js/compreDisplay/anhui/anhui.json";
+// let uploadedDataURL = "../../js/compreDisplay/anhui/anhui.json";
+let uploadedDataURL = "../../js/compreDisplay/anhui/gansushi.json";
 let myChart = echarts.init(document.getElementById('echarts-map'));
 // 选中的地市名称和编码
 let clickCityName = null, clickCityCode = null;
@@ -372,45 +373,45 @@ function setUploadedDataURL2(name) {
           }
     }
 	console.log(name)
-    if (name === "合肥市") {
+    if (name === "张掖市") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/hefei.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/zhangye.json';
-        clickCityName = '安徽省电力公司合肥供电公司';
+        clickCityName = '张掖市';
-    } else if (name === "芜湖市") {
+    } else if (name === "白银市") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/wuhu.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/baiying.json';
-        clickCityName = '安徽省电力公司芜湖供电公司';
+        clickCityName = '白银市';
-    } else if (name === "蚌埠市") {
+    } else if (name === "定西市") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/bengbu.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/dingxi.json';
-        clickCityName = '安徽省电力公司蚌埠供电公司';
+        clickCityName = '定西市';
-    } else if (name === "淮南市") {
+    } else if (name === "甘南藏族自治州") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/huainan.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/gannna.json';
-        clickCityName = '安徽省电力公司淮南供电公司';
+        clickCityName = '甘南藏族自治州';
-    } else if (name === "马鞍山市") {
+    } else if (name === "金昌市") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/maansan.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/jinchang.json';
-        clickCityName = '安徽省电力公司马鞍山供电公司';
+        clickCityName = '金昌市';
-    } else if (name === "淮北市") {
+    } else if (name === "兰州市") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/huaibei.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/lanzhou.json';
-        clickCityName = '安徽省电力公司淮北供电公司';
+        clickCityName = '兰州市';
-    } else if (name === "铜陵市") {
+    } else if (name === "陇南市") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/tongling.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/longnana.json';
-        clickCityName = '安徽省电力公司铜陵供电公司';
+        clickCityName = '陇南市';
-    } else if (name === "安庆市") {
+    } else if (name === "平凉市") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/anqing.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/pingliang.json';
-        clickCityName = '安徽省电力公司安庆供电公司';
+        clickCityName = '平凉市';
-    } else if (name === "黄山市") {
+    } else if (name === "庆阳市") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/huangshan.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/qingyang.json';
-        clickCityName = '安徽省电力公司黄山供电公司';
+        clickCityName = '庆阳市';
-    } else if (name === "阜阳市") {
+    } else if (name === "天水市") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/fuyang.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/tianshui.json';
-        clickCityName = '安徽省电力公司阜阳供电公司';
+        clickCityName = '天水市';
-    } else if (name === "宿州市") {
+    } else if (name === "武威市") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/suzhou.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/wuwei.json';
-        clickCityName = '安徽省电力公司宿州供电公司';
+        clickCityName = '武威市';
-    } else if (name === "滁州市") {
+    } else if (name === "酒泉市") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/chuzhou.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/jiuchuan.json';
-        clickCityName = '安徽省电力公司滁州供电公司';
+        clickCityName = '酒泉市';
-    } else if (name === "六安市") {
+    } else if (name === "临夏回族自治州") {
-        uploadedDataURL2 = '../../js/compreDisplay/anhui/liuan.json';
+        uploadedDataURL2 = '../../js/compreDisplay/anhui/linxia.json';
-        clickCityName = '安徽省电力公司六安供电公司';
+        clickCityName = '临夏回族自治州';
     } else if (name === "宣城市") {
         uploadedDataURL2 = '../../js/compreDisplay/anhui/xuancheng.json';
         clickCityName = '安徽省电力公司宣城供电公司';

login.html

@@ -16,7 +16,7 @@
 <script src="bns/js/login/login.js" type="text/javascript"></script>
 <body>
 <div id="wdiv">
-    <div class="fdiv">安&nbsp全&nbsp质&nbsp量&nbsp智&nbsp慧&nbsp决&nbsp策&nbsp中&nbsp心</div>
+    <div class="fdiv">可&nbsp视&nbsp化&nbsp现&nbsp场&nbsp安&nbsp全&nbsp监&nbsp督&nbsp管&nbsp控&nbsp系&nbsp统</div>
     <div class="mdiv">
         <div style="border-bottom:1px solid #FFFFFF;width: 60%;margin-left: 18%;top: 72px;height: 40px;position: absolute">
             <IMG src="bns/img/login/user.png">