Merge branch 'master' of http://116.63.33.55/git/nazw

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

@@ -42,7 +42,9 @@ function culturalTourism() {
           "2023年9月",
           "2023年10月",
           "2023年11月",
-          "2023年12月"
+          "2023年12月",
+          "2024年1月",
+          "2024年2月"
         ],
         axisPointer: {
           type: "shadow",
@@ -77,7 +79,7 @@ function culturalTourism() {
             return value + " 人次";
           },
         },
-        data: [0, 788, 1026, 1740, 1967, 2200, 2720, 2748, 3231, 5539,6571,5639],
+        data: [0, 788, 1026, 1740, 1967, 2200, 2720, 2748, 3231, 5539,6571,5639,3153,2802],
       },
       {
         name: "国内游客",
@@ -89,7 +91,7 @@ function culturalTourism() {
         },
         data: [
           4741245, 4821452, 4524574, 4054582, 4484144, 3325145, 4047415,
-          3415412, 4851414, 4914414,2175241,2812211
+          3415412, 4851414, 4914414,2175241,2812211,4892451,5132351
         ],
         itemStyle: {
           color: "#ed9121",
@@ -105,7 +107,7 @@ function culturalTourism() {
           },
         },
         data: [
-          33.46, 20.45, 26.2, 28.72, 18.09, 16.04, 10.66, 17.96, 13.98, 6.38,21.03,19.86
+          33.46, 20.45, 26.2, 28.72, 18.09, 16.04, 10.66, 17.96, 13.98, 6.38,99.34,3.73,3.19,6.45
         ],
       },
       {
@@ -117,7 +119,7 @@ function culturalTourism() {
             return value + " %";
           },
         },
-        data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0],
+        data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0,255.58],
       },
     ],
   };
@@ -172,6 +174,8 @@ function culturalTourism() {
           "2023年10月",
           "2023年11月",
           "2023年12月",
+          "2024年1月",
+          "2024年2月"
         ],
         axisPointer: {
           type: "shadow",
@@ -208,7 +212,7 @@ function culturalTourism() {
         },
         data: [
           254124, 303870, 300848, 355720, 326500, 310942, 389612, 352098,
-          284177, 344331,276747,266758
+          284177, 344331,276747,266758,250869,353031
         ],
       },
       {
@@ -219,7 +223,7 @@ function culturalTourism() {
             return value + " 人次";
           },
         },
-        data: [0, 788, 1026, 1740, 1967, 2200, 2720, 2748, 3231, 5539,6571,5639],
+        data: [0, 788, 1026, 1740, 1967, 2200, 2720, 2748, 3231, 5539,6571,5639,3153,2802],
         itemStyle: {
           color: "#ed9121",
         },
@@ -234,8 +238,8 @@ function culturalTourism() {
           },
         },
         data: [
-          22.09, 95.24, 132.26, 181.72, 116.83, 32.77, 106.47, 17.96, 26.06,
-          18.81,72.26,75.65
+          22.09, 95.24, 132.26, 181.72, 116.83, 32.77, 22.13, 106.47, 26.06,
+          18.81,1076.45,137.03,-1.28,16.18
         ],
       },
       {
@@ -247,7 +251,7 @@ function culturalTourism() {
             return value + " %";
           },
         },
-        data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0],
+        data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0,255.58],
       },
     ],
   };
@@ -302,7 +306,9 @@ function culturalTourism() {
           "2023年9月",
           "2023年10月",
           "2023年11月",
-          "2023年12月"
+          "2023年12月",
+          "2024年1月",
+          "2024年2月"
         ],
         axisPointer: {
           type: "shadow",
@@ -339,7 +345,7 @@ function culturalTourism() {
         },
         data: [
           251414, 304154, 322454, 308451, 424215, 298541, 353411, 296332,
-          384412, 311452, 198541, 163741
+          384412, 311452, 198541, 163741,271547,325145
         ],
       },
       {
@@ -352,7 +358,7 @@ function culturalTourism() {
           },
         },
         data: [
-          38.55, 24.93, 34.84, 20.75, 26.53, 20.44, 15.02, 20.03, 19.22, 8.82,25.39,24.64
+          38.55, 24.93, 34.84, 20.75, 26.53, 20.44, 15.02, 20.03, 19.22, 8.82,122.72,10.78,8.01,6.9
         ],
       },
     ],
@@ -409,6 +415,8 @@ function culturalTourism() {
           "2023年10月",
           "2023年11月",
           "2023年12月",
+          "2024年1月",
+          "2024年2月"
         ],
         axisPointer: {
           type: "shadow",
@@ -444,7 +452,7 @@ function culturalTourism() {
           },
         },
         data: [
-          33102, 33104, 33245, 33447, 33541, 33654, 33145, 33210, 32010, 32511,31214,32345
+          33102, 33104, 33245, 33447, 33541, 33654, 33145, 33210, 32010, 32511,31214,32345,34611,34341
         ],
       },
       {
@@ -456,7 +464,7 @@ function culturalTourism() {
             return value + " 万元";
           },
         },
-        data: [6642, 6647, 6721, 6842, 6847, 6719, 6641, 6652, 6622, 6421,6426,5934],
+        data: [6642, 6647, 6721, 6842, 6847, 6719, 6641, 6652, 6622, 6421,6424,5934,6721,6814],
       },
       {
         name: "旅游从业人数同比增减",
@@ -467,7 +475,7 @@ function culturalTourism() {
             return value + " %";
           },
         },
-        data: [3.12, 3.05, 3.54, 4.2, 4.86, 5.23, 3.67, 5.57, 3.22, 4.07,4.02,3.77,],
+        data: [3.12, 3.05, 3.54, 4.2, 4.86, 5.23, 3.67, 5.57, 3.22, 4.07,3.63,1.13,4.56,3.74],
       },
       {
         name: "旅游直接从业人数同比增减",
@@ -478,7 +486,7 @@ function culturalTourism() {
             return value + " %";
           },
         },
-        data: [3.46, 3.46, 4.69, 6.66, 6.98, 5.15, 4.03, 4.76, 4.88, 2.88,5.1,4.73],
+        data: [3.46, 3.46, 4.69, 6.66, 6.98, 5.15, 4.03, 4.76, 4.88, 2.88,9.53,0.37,1.19,2.51],
       },
     ],
   };

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

@@ -124,7 +124,7 @@ function education() {
             },
         },
         dataset: {
-            source: jsonData[3].student
+            source: jsonData[jsonData.length-1].student
         },
         xAxis: {
             type: 'category',
@@ -243,7 +243,7 @@ function education() {
             },
         },
         dataset: {
-            source: jsonData[3].school
+            source: jsonData[jsonData.length-1].school
         },
         xAxis: {
             type: 'category',
@@ -349,7 +349,7 @@ function education() {
     <div class="right">
         <div>专任教师人数</div>
         <div class="bottom">
-            <div class="number">`+ jsonData[4].zrjsrs + `</div>
+            <div class="number">`+ jsonData[jsonData.length-1].zrjsrs + `</div>
             <div class="unit">人</div>
         </div>
     </div>
@@ -359,7 +359,7 @@ function education() {
     <div class="right">
         <div>公办园在园幼儿占比</div>
         <div class="bottom">
-            <div class="number">`+ jsonData[4].gbl + `</div>
+            <div class="number">`+ jsonData[jsonData.length-1].gbl + `</div>
             <div class="unit">%</div>
         </div>
     </div>
@@ -369,7 +369,7 @@ function education() {
     <div class="right">
         <div>普惠性幼儿园覆盖率</div>
         <div class="bottom">
-            <div class="number">`+ jsonData[4].hpl + `</div>
+            <div class="number">`+ jsonData[jsonData.length-1].hpl + `</div>
             <div class="unit">%</div>
         </div>
     </div>
@@ -387,11 +387,11 @@ function education() {
         <li>重庆市机电工程高级技工学校（人）</li>
     </ul>
     <ul class="number">
-        <li style="width: 360px;">`+ jsonData[3].zj + `</li>
-        <li>`+ jsonData[3].lmh + `</li>
-        <li>`+ jsonData[3].hyly + `</li>
-        <li>`+ jsonData[3].yykj + `</li>
-        <li>`+ jsonData[3].jdgc + `</li>
+        <li style="width: 360px;">`+ jsonData[jsonData.length-1].zj + `</li>
+        <li>`+ jsonData[jsonData.length-1].lmh + `</li>
+        <li>`+ jsonData[jsonData.length-1].hyly + `</li>
+        <li>`+ jsonData[jsonData.length-1].yykj + `</li>
+        <li>`+ jsonData[jsonData.length-1].jdgc + `</li>
     </ul>`
     $(".jylyTable").empty().html(zcjkHtml)
     // 移动端表格
@@ -402,17 +402,17 @@ function education() {
         <li><span>重庆航运旅游</span><span>学校（人）</span></li>
     </ul>
     <ul class="number">
-        <li style="width: 360px;">`+ jsonData[3].zj + `</li>
-        <li>`+ jsonData[3].lmh + `</li>
-        <li>`+ jsonData[3].hyly + `</li>
+        <li style="width: 360px;">`+ jsonData[jsonData.length-1].zj + `</li>
+        <li>`+ jsonData[jsonData.length-1].lmh + `</li>
+        <li>`+ jsonData[jsonData.length-1].hyly + `</li>
     </ul>
     <ul class="titleList">
         <li><span>重庆市医药科技</span><span>学校（人）</span></li>
         <li><span>重庆市机电工程高级</span><span>技工学校（人）</span></li>
     </ul>
     <ul class="number">
-        <li>`+ jsonData[3].yykj + `</li>
-        <li>`+ jsonData[3].jdgc + `</li>
+        <li>`+ jsonData[jsonData.length-1].yykj + `</li>
+        <li>`+ jsonData[jsonData.length-1].jdgc + `</li>
     </ul>`
     $("#jylyTableM").empty().html(zcjkHtmlM)
     $('#yearl').on('change', function () {

nnzwminiapp/app.json

@@ -72,7 +72,8 @@
         "pages/zcinfo/zcinfo",
         "pages/nnzzd/nnzzd",
         "pages/map-vr/map-vr",
-        "pages/tdcr/index"
+        "pages/tdcr/index",
+        "pages/tdcr/tdcr-list/index"
       ]
     }
   ],

nnzwminiapp/pagesPublic/pages/tdcr/tdcr-list/index.js

@@ -0,0 +1,71 @@
+// pagesPublic/pages/tdcr/tdcr-list/index.js
+import {
+	imgUrl,
+  request,
+  request2
+} from "../../api/request"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+	imgUrl
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

nnzwminiapp/pagesPublic/pages/tdcr/tdcr-list/index.json

@@ -0,0 +1,4 @@
+{
+	"navigationBarTitleText": "",
+	"navigationStyle": "custom"
+}

nnzwminiapp/pagesPublic/pages/tdcr/tdcr-list/index.wxml

@@ -0,0 +1,38 @@
+<!--pagesPublic/pages/tdcr/tdcr-list/index.wxml-->
+<view class="list_main" style="background-image: url('{{imgUrl}}tdcrlist/tdcrlist3.png'); background-size: 100% 100%;">
+	<view style="height: 14vh;"></view>
+	<view class="map-block" style="background-image: url('{{imgUrl}}tdcrlist/tdcrlist1.png'); background-repeat: no-repeat; ">
+	
+		<view class="block-name1" style="background-image:url('{{imgUrl}}tdcrlist/tdcrlist7.png');">
+			中西医结合医院
+		</view>
+		<view class="block-name2" style="background-image:url('{{imgUrl}}tdcrlist/tdcrlist7.png');">
+			廖家山地块
+		</view>
+		<view class="block-name3" style="background-image:url('{{imgUrl}}tdcrlist/tdcrlist8.png');">
+			南坪东路588号
+		</view>
+		<view class="block-name4" style="background-image:url('{{imgUrl}}tdcrlist/tdcrlist7.png');">
+			四公里片区
+		</view>
+		<view class="block-name5" style="background-image:url('{{imgUrl}}tdcrlist/tdcrlist7.png');">
+			双峰山1号地块
+		</view>
+		<view class="jt postion1" style="background-image: url('{{imgUrl}}tdcrlist/tdcrlist11.png');">
+		</view>
+		<view class="jt postion2" style="background-image: url('{{imgUrl}}tdcrlist/tdcrlist11.png');">
+		</view>
+		<view class="jt postion3" style="background-image: url('{{imgUrl}}tdcrlist/tdcrlist11.png');">
+		</view>
+		<view class="jt postion4" style="background-image: url('{{imgUrl}}tdcrlist/tdcrlist11.png');">
+		</view>
+		<view class="jt postion5" style="background-image: url('{{imgUrl}}tdcrlist/tdcrlist11.png');">
+		</view>
+		<view class="line line1"></view>
+		<view class="line line2"></view>
+		<view class="line line3"></view>
+		<view class="line line4"></view>
+		<view class="line line5"></view>
+	</view>
+
+</view>

nnzwminiapp/pagesPublic/pages/tdcr/tdcr-list/index.wxss

@@ -0,0 +1,167 @@
+/* pagesPublic/pages/tdcr/tdcr-list/index.wxss */
+
+.list_main {
+	width: 100%;
+	height: 100vh;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+}
+
+.map-block {
+	width: 80%;
+	height: 100vw;
+	background-size: 100% 100%;
+}
+
+.block-name1 {
+	width: 258rpx;
+	height: 85rpx;
+	line-height: 85rpx;
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #00FFFF;
+	padding-left: 46rpx;
+	background-size: 100%;
+	background-repeat: no-repeat;
+	position: relative;
+	left: 68rpx;
+	top: -9rpx;
+}
+
+.block-name2 {
+	width: 234rpx;
+	height: 85rpx;
+	line-height: 85rpx;
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #00FFFF;
+	padding-left: 61rpx;
+	background-size: 100%;
+	background-repeat: no-repeat;
+	position: relative;
+	left: 125rpx;
+	top: -2rpx;
+}
+
+.block-name3 {
+	width: 300rpx;
+	height: 85rpx;
+	line-height: 85rpx;
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #0F2887;
+	padding-left: 46rpx;
+	background-size: 100%;
+	background-repeat: no-repeat;
+	position: relative;
+	left: 159rpx;
+	top: 0rpx;
+}
+
+.block-name4 {
+	width: 213rpx;
+	/* height: 85rpx; */
+	line-height: 78rpx;
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #00FFFF;
+	padding-left: 46rpx;
+	background-size: 100%;
+	background-repeat: no-repeat;
+	position: relative;
+	left: 223rpx;
+	bottom: -480rpx;
+}
+
+.block-name5 {
+	width: 234rpx;
+	/* height: 85rpx; */
+	line-height: 85rpx;
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #00FFFF;
+	padding-left: 46rpx;
+	background-size: 100%;
+	background-repeat: no-repeat;
+	position: relative;
+	left: 120rpx;
+	bottom: -485rpx;
+}
+
+.jt {
+	width: 40rpx;
+	height: 40rpx;
+	background-size: 100%;
+	position: relative;
+	z-index: 40;
+}
+
+.postion1 {
+	top: -68rpx;
+	left: 133rpx;
+	z-index: 45;
+}
+
+.postion2 {
+	top: -26rpx;
+	left: 70rpx;
+	z-index: 45;
+}
+
+.postion3 {
+	top: 36rpx;
+	left: 172rpx;
+	z-index: 45;
+}
+
+.postion4 {
+	top: 46rpx;
+	left: 235rpx;
+	z-index: 45;
+}
+
+.postion5 {
+	top: 38rpx;
+	left: 135rpx;
+	z-index: 45;
+}
+
+.line {
+	border-left: dashed 1px #00FFFF;
+	width: 1rpx;
+	
+	position: relative;
+}
+
+.line1 {
+	height: 39vw;
+    top: -371rpx;
+    left: 191rpx;
+    z-index: 30;
+}
+.line2 {
+	height: 48vw;
+    top: -840rpx;
+    left: 88rpx;
+	z-index: 30;
+}
+.line3 {
+	height: 26vw;
+    top: -1113rpx;
+    left: 151rpx;
+	z-index: 30;
+}
+.line4 {
+	height: 15vw;
+    top: -827rpx;
+    left: 254rpx;
+	z-index: 30;
+}
+.line5 {
+	height: 20vw;
+    top: -903rpx;
+    left: 150rpx;
+	z-index: 30;
+}