修改样式

nngkxxdp/src/main/resources/static/natj/dataCenter/css/index.css

@@ -1,387 +1,390 @@
 /* 菜单部分 */
 .mainSjzx {
-    width: 1400px;
-    margin: 10px auto;
-    display: flex;
-    /* height: 900px; */
+  width: 1400px;
+  margin: 10px auto;
+  display: flex;
+  /* height: 900px; */
 }
 
 .arrow {
-    border-top: 10px solid transparent;
-    border-bottom: 10px solid transparent;
-    border-left: 10px solid #125DB2;
-    position: absolute;
-    right: -10px;
+  border-top: 10px solid transparent;
+  border-bottom: 10px solid transparent;
+  border-left: 10px solid #125db2;
+  position: absolute;
+  right: -10px;
 }
 
 .mainSjzx .menu {
-    width: 150px;
-    height: 850px;
-    background: #EBF4FF;
+  width: 150px;
+  height: 850px;
+  background: #ebf4ff;
 }
 
 .menu .tabs li {
-    width: 100%;
-    height: 60px;
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    font-size: 20px;
-    font-weight: bold;
-    color: #333333;
-    padding: 0 15px;
-    box-sizing: border-box;
-    position: relative;
-    cursor: pointer;
+  width: 100%;
+  height: 60px;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  font-size: 20px;
+  font-weight: bold;
+  color: #333333;
+  padding: 0 15px;
+  box-sizing: border-box;
+  position: relative;
+  cursor: pointer;
 }
 
 .menu .tabs li.click {
-    background: #125DB2;
-    color: #fff;
+  background: #125db2;
+  color: #fff;
 }
 /* 公共样式 */
 .content {
-    /* height: 729px; */
-    width: -moz-calc(100% - 150px);
-    width: -webkit-calc(100% - 150px);
-    width: calc(100% - 150px);
+  /* height: 729px; */
+  width: -moz-calc(100% - 150px);
+  width: -webkit-calc(100% - 150px);
+  width: calc(100% - 150px);
 }
-.content .items{
-    width: 100%;
-    height: 100%;
+.content .items {
+  width: 100%;
+  height: 100%;
 }
 
 .content .year {
-    width: 210px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 16px;
-    color: #333333;
-    left: 50%;
-    margin-left: -90px;
+  width: 210px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 16px;
+  color: #333333;
+  left: 50%;
+  margin-left: -90px;
 }
 
 .content .year select {
-    width: 140px;
-    height: 34px;
-    border: 1px solid #D5D5D5;
-    border-radius: 4px;
-    text-align: center;
-    cursor: pointer;
+  width: 140px;
+  height: 34px;
+  border: 1px solid #d5d5d5;
+  border-radius: 4px;
+  text-align: center;
+  cursor: pointer;
 }
 select {
-    /*将默认的select选择框样式清除*/
-    appearance:none;
-    -moz-appearance:none;
-    -webkit-appearance:none;
-    }
-    /*清除ie的默认选择框样式清除，隐藏下拉箭头*/
-    select::-ms-expand {
-    display: none;
+  /*将默认的select选择框样式清除*/
+  appearance: none;
+  -moz-appearance: none;
+  -webkit-appearance: none;
+}
+/*清除ie的默认选择框样式清除，隐藏下拉箭头*/
+select::-ms-expand {
+  display: none;
 }
 /* 社会保障 */
 .div-shbz .itemData {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-around;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
 }
 
 .div-shbz .itemData li {
-    width: 403px;
-    height: 130px;
-    background: #F0F0F0;
-    border-radius: 10px;
-    display: flex;
-    align-items: center;
-    font-size: 20px;
-    color: #333333;
-    margin-top: 19px;
+  width: 403px;
+  height: 130px;
+  background: #f0f0f0;
+  border-radius: 10px;
+  display: flex;
+  align-items: center;
+  font-size: 20px;
+  color: #333333;
+  margin-top: 19px;
 }
 
 .div-shbz .itemData li .right .bottom {
-    display: flex;
-    align-items: flex-end;
-    margin-top: 16px;
+  display: flex;
+  align-items: flex-end;
+  margin-top: 16px;
 }
 
 .div-shbz .itemData li .right .bottom .number {
-    font-size: 34px;
-    font-weight: bold;
-    font-style: italic;
-    color: #004A93;
+  font-size: 34px;
+  font-weight: bold;
+  font-style: italic;
+  color: #004a93;
 }
 
 .div-shbz .itemData li .right .bottom .unit {
-    color: #999999;
-    margin-left: 10px;
+  color: #999999;
+  margin-left: 10px;
 }
 .div-shbz .shbzTable {
-    margin-top: 70px;
+  margin-top: 70px;
 }
 
 .div-shbz .shbzTable .title,
 .div-shbz .shbzTable .number {
-    display: flex;
-    font-size: 18px;
-    font-family: Microsoft YaHei;
-    color: #FFFFFF;
-    margin-left: 10px;
+  display: flex;
+  font-size: 18px;
+  font-family: Microsoft YaHei;
+  color: #ffffff;
+  margin-left: 10px;
 }
 
 .div-shbz .shbzTable .title li,
 .div-shbz .shbzTable .number li {
-    width: 260px;
-    height: 60px;
-    background: #7293B9;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    border-right: 1px solid #fff;
+  width: 260px;
+  height: 60px;
+  background: #7293b9;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border-right: 1px solid #fff;
 }
 
 .div-shbz .shbzTable .number li {
-    background: #fff;
-    color: #333;
-    border: 1px solid #7293B9;
-    border-right: none;
+  background: #fff;
+  color: #333;
+  border: 1px solid #7293b9;
+  border-right: none;
 }
 
 .div-shbz .shbzTable .number li:last-child,
 .div-shbz .shbzTable .title li:last-child {
-    border-right: 1px solid #7293B9;
+  border-right: 1px solid #7293b9;
 }
 
 /* 文化文旅*/
 .div-whwl .range {
-    display: flex;
-    justify-content: flex-end;
+  display: flex;
+  justify-content: flex-end;
 }
 
 .div-whwl .range button {
-    width: 156px;
-    height: 34px;
-    background: #FFFFFF;
-    border: 1px solid #999999;
-    color: #999999;
-    font-size: 16px;
-    font-family: Microsoft YaHei;
-    cursor: pointer;
+  width: 156px;
+  height: 34px;
+  background: #ffffff;
+  border: 1px solid #999999;
+  color: #999999;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  cursor: pointer;
 }
 
 .div-whwl .range button.click {
-    border: 1px solid #4582EC !important;
-    color: #4684ED;
+  border: 1px solid #4582ec !important;
+  color: #4684ed;
 }
 .div-whwl .wsylTable {
-    margin-top: 70px;
+  margin-top: 70px;
 }
 
 .div-whwl .wsylTable .title,
 .div-whwl .wsylTable .number {
-    display: flex;
-    font-size: 18px;
-    font-family: Microsoft YaHei;
-    color: #FFFFFF;
-    margin-left: 10px;
+  display: flex;
+  font-size: 18px;
+  font-family: Microsoft YaHei;
+  color: #ffffff;
+  margin-left: 10px;
 }
 
 .div-whwl .wsylTable .title li,
 .div-whwl .wsylTable .number li {
-    width: 160px;
-    height: 60px;
-    background: #7293B9;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    border-right: 1px solid #fff;
+  width: 160px;
+  height: 60px;
+  background: #7293b9;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border-right: 1px solid #fff;
 }
 
 .div-whwl .wsylTable .number li {
-    background: #fff;
-    color: #333;
-    border: 1px solid #7293B9;
-    border-right: none;
-    text-align: center;
+  background: #fff;
+  color: #333;
+  border: 1px solid #7293b9;
+  border-right: none;
+  text-align: center;
 }
 
 .div-whwl .wsylTable .number li:last-child,
 .div-whwl .wsylTable .title li:last-child {
-    border-right: 1px solid #7293B9;
+  border-right: 1px solid #7293b9;
 }
 
 /* 卫生医疗 */
 .div-wsyl {
-    height: 100%;
-    padding-left: 10px;
-    position: relative;
+  height: 100%;
+  padding-left: 10px;
+  position: relative;
 }
 
 .div-wsyl .bg {
-    position: absolute;
-    width: 100%;
-    height: 300px;
-    bottom: 20px;
+  position: absolute;
+  width: 100%;
+  height: 300px;
+  bottom: 20px;
 }
 
 .div-wsyl .cont {
-    position: absolute;
-    z-index: 1;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
+  position: absolute;
+  z-index: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 
 .div-wsyl .cont .detail {
-    width: 338px;
-    border-radius: 10px;
-    background-size: 100% 100%;
-    padding: 30px 15px;
-    box-sizing: border-box;
-    margin-bottom: -15px;
+  width: 338px;
+  border-radius: 10px;
+  background-size: 100% 100%;
+  padding: 30px 15px;
+  box-sizing: border-box;
+  margin-bottom: -15px;
 }
 
 .div-wsyl .cont .list li {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 
 .div-wsyl .cont .list li span:first-child {
-    font-size: 16px;
-    font-family: Microsoft YaHei;
-    color: #666666;
-    line-height: 36px;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  color: #666666;
+  line-height: 36px;
 }
 
 .div-wsyl .cont .list li span:last-child {
-    width: 70px;
-    font-size: 20px;
-    font-family: Microsoft YaHei;
-    font-weight: bold;
-    font-style: italic;
-    color: #125DB2;
-    line-height: 36px;
+  width: 70px;
+  font-size: 20px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  font-style: italic;
+  color: #125db2;
+  line-height: 36px;
 }
 
 .div-wsyl .right .title {
-    width: 676px;
-    height: 40px;
-    line-height: 40px;
-    text-align: center;
-    background: #E9E9E9;
-    border-radius: 10px 10px 0px 0px;
-    font-size: 18px;
-    color: #333333;
-    margin-left: 0;
-    margin-bottom: -1px;
+    font-size: 24px;
+    font-family: Microsoft YaHei;
+    font-weight: bold;
+    color: #0084ff;
 }
 /* 社会救助 */
-.div-shjz .title,.div-wsyl .title {
-    width: 100%;
-    height: 50px;
-    margin: 10px auto;
-    background: #EBF4FF;
-    margin-left: 10px;
+.div-shjz .title,
+.div-wsyl .title {
+  width: 100%;
+  height: 50px;
+  margin: 10px auto;
+  /* background: #EBF4FF; */
+  margin-left: 10px;
 }
 
-.div-shjz .title,.div-wsyl .title {
-    display: flex;
-    justify-content: center;
+.div-shjz .title,
+.div-wsyl .title {
+  display: flex;
+  justify-content: center;
 }
 
 .div-shjz .title .list,
 .div-wsyl .title .list {
-    width: 208px;
-    height: 50px;
-    line-height: 50px;
-    font-size: 16px;
-    font-family: Microsoft YaHei;
-    color: #333333;
-    text-align: center;
-    margin: 0 47px;
-    cursor: pointer;
+  width: 208px;
+  height: 50px;
+  line-height: 50px;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  color: #333333;
+  text-align: center;
+  margin: 0 47px;
+  cursor: pointer;
 }
 
 .div-shjz .title .select,
 .div-wsyl .title .select {
-    background: #125DB2;
-    color: #fff;
+  background: #125db2;
+  color: #fff;
 }
 /* 教育领域 */
 .div-jyly .title {
-    font-size: 20px;
-    color: #333333;
-    margin: 20px auto;
-    text-align: center;
+  font-size: 20px;
+  color: #333333;
+  margin: 20px auto;
+  text-align: center;
 }
 
 .div-jyly .itemData {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 }
 
 .div-jyly .itemData li {
-    width: 265px;
-    height: 130px;
-    border-radius: 10px;
-    display: flex;
-    align-items: center;
-    font-size: 18px;
-    color: #333333;
-    margin-top: 19px;
+  width: 265px;
+  height: 130px;
+  border-radius: 10px;
+  display: flex;
+  align-items: center;
+  font-size: 18px;
+  color: #333333;
+  margin-top: 19px;
 }
 
 .div-jyly .itemData li .right .bottom {
-    display: flex;
-    align-items: flex-end;
-    margin-top: 16px;
+  display: flex;
+  align-items: flex-end;
+  margin-top: 16px;
 }
 
 .div-jyly .itemData li .right .bottom .number {
-    font-size: 34px;
-    font-weight: bold;
-    font-style: italic;
-    color: #004A93;
+  font-size: 34px;
+  font-weight: bold;
+  font-style: italic;
+  color: #004a93;
 }
 
 .div-jyly .itemData li .right .bottom .unit {
-    color: #999999;
-    margin-left: 10px;
+  color: #999999;
+  margin-left: 10px;
 }
 
 .div-jyly .jylyTable .titleList,
 .div-jyly .jylyTable .number {
-    display: flex;
-    font-size: 16px;
-    font-family: Microsoft YaHei;
-    color: #FFFFFF;
-    margin-left: 20px;
+  display: flex;
+  font-size: 16px;
+  font-family: Microsoft YaHei;
+  color: #ffffff;
+  margin-left: 20px;
 }
 
 .div-jyly .jylyTable .titleList li,
 .div-jyly .jylyTable .number li {
-    width: 500px;
-    height: 60px;
-    background: #7293B9;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    border-right: 1px solid #fff;
+  width: 500px;
+  height: 60px;
+  background: #7293b9;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  border-right: 1px solid #fff;
 }
 
 .div-jyly .jylyTable .number li {
-    background: #fff;
-    color: #333;
-    border: 1px solid #7293B9;
-    border-right: none;
+  background: #fff;
+  color: #333;
+  border: 1px solid #7293b9;
+  border-right: none;
 }
 
 .div-jyly .jylyTable .number li:last-child,
 .div-jyly .jylyTable .titleList li:last-child {
-    border-right: 1px solid #7293B9;
-}
+  border-right: 1px solid #7293b9;
+}
+
+.div-wsyl .title {
+  font-size: 24px;
+  font-family: Microsoft YaHei;
+  font-weight: bold;
+  color: #0084ff;
+}

nngkxxdp/src/main/resources/static/natj/dataCenter/index.html

@@ -319,11 +319,16 @@
                     <li class="list" data-type="2">医疗卫生人员</li>
                     <li class="list" data-type="3">诊疗人数</li>
                 </ul>
+                <div class="chart-item">
+                    <div class="title"><span>医疗卫生机构情况</span></div>
+                </div>
                 <div style="display: flex;" class="yljgcws">
-                    <div class="left">
+                    <div class="ylws-left">
+                        <div class="title">医疗卫生机构数</div>
                         <div id="wsylchar"></div>
                     </div>
                     <div class="right">
+                        <div class="title">医疗卫生机构床位数</div>
                         <div>
                             <div class="title">2022年</div>
                             <div id="other1"></div>

nngkxxdp/src/main/resources/static/natj/dataCenter/js/culturalTourism.js

@@ -2,6 +2,7 @@ function culturalTourism() {
   // 文化旅游
   var chartDom = document.getElementById("whlyEchar");
   var myChart = echarts.init(chartDom);
+  myChart.clear();
   var alldata = [
     [3418160, 352098],
     [33427158, 2604714],
@@ -123,6 +124,7 @@ function culturalTourism() {
 
   var chartDom = document.getElementById("gyykEchart");
   var myChart = echarts.init(chartDom);
+  myChart.clear();
   var alldata = [
     [3418160, 352098],
     [33427158, 2604714],
@@ -250,6 +252,7 @@ function culturalTourism() {
 
   var chartDom = document.getElementById("zsrEchart");
   var myChart = echarts.init(chartDom);
+  myChart.clear();
   var alldata = [
     [3418160, 352098],
     [33427158, 2604714],
@@ -353,6 +356,7 @@ function culturalTourism() {
 
   var chartDom = document.getElementById("cyrsEchart");
   var myChart = echarts.init(chartDom);
+  myChart.clear();
   var alldata = [
     [3418160, 352098],
     [33427158, 2604714],

nngkxxdp/src/main/resources/static/natj/enter_dataAll.html

@@ -339,14 +339,14 @@
                 <div class="more" onclick="window.open('https://www.cqna.gov.cn/data/natj/dataCenter/index.html?id=2')">
                     更多</div>
             </div>
-            <div class="div-whwl">
+            <!-- <div class="div-whwl">
                 <div class="range">
                     <button class="thisMonth click" style="border-radius: 4px 0px 0px 4px;border-right: none;"
                         onlick="thisMonth()">2023年10月</button>
                     <button class="cumulat"
                         style="border-radius: 0px 4px 4px 0px;border-left: none;">截至2023年10月累计</button>
                 </div>
-            </div>
+            </div> -->
             <div id="whlyEchar" style="height: 321px;width: 690px;"></div>
         </div>
         <div class="plate">

nngkxxdp/src/main/resources/static/natj/enter_dataAllMobile.html

@@ -336,7 +336,7 @@
                     更多
                 </div>
             </div>
-            <div class="div-whwl">
+            <!-- <div class="div-whwl">
                 <div class="range">
                     <button class="thisMonth click" style="border-radius: 4px 0px 0px 4px;border-right: none;"
                         onlick="thisMonth()">2023年10月
@@ -344,7 +344,7 @@
                     <button class="cumulat" style="border-radius: 0px 4px 4px 0px;border-left: none;">截至2023年10月累计
                     </button>
                 </div>
-            </div>
+            </div> -->
             <div id="whlyEchar" style="height: 390px;width: 98vw;margin: auto;"></div>
         </div>
         <div class="plate">