Merge branch 'master' of http://120.78.165.83:8123/git/nazw

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

@@ -32,7 +32,7 @@
                         <i class="iconfont icon-liuyan"></i>
                     </div>
                     <div class="textArea">
-                        <div class="textAreaTop">近30天受理留言</div>
+                        <div class="textAreaTop">近30天来信</div>
                         <div class="textAreaBottom"><span id="acceptanceNum">0</span>&nbsp;&nbsp;<span>件</span></div>
                     </div>
                 </li>
@@ -41,7 +41,7 @@
                         <i class="iconfont icon-liuyan2"></i>
                     </div>
                     <div class="textArea">
-                        <div class="textAreaTop">近30天已办结留言</div>
+                        <div class="textAreaTop">近30天受理</div>
                         <div class="textAreaBottom"><span id="completedNum">0</span>&nbsp;&nbsp;<span>件</span></div>
                     </div>
                 </li>
@@ -50,7 +50,7 @@
                         <i class="iconfont icon-liuyan1"></i>
                     </div>
                     <div class="textArea">
-                        <div class="textAreaTop">近30天受理中留言</div>
+                        <div class="textAreaTop">近30天办理</div>
                         <div class="textAreaBottom"><span id="acceptingNum">0</span>&nbsp;&nbsp;<span>件</span></div>
                     </div>
                 </li>

nngkxxdp/src/main/resources/static/natj/js/letterBox.js

@@ -1,5 +1,5 @@
-//const PATH = 'http://192.168.1.223:7777';
- const PATH = 'http://data.cqna.gov.cn';
+const PATH = 'http://192.168.1.253:7777';
+//  const PATH = 'http://data.cqna.gov.cn';
 const detailLimitDefault = 10;
 
 
@@ -215,7 +215,7 @@ function staticTitleData(data) {
  */
 function drawHandleByBarChart() {
     let barData;
-    get('/mail/queryMonthStatus', false, {}, function (res) {
+    get('/mail/queryToType', false, {"type": 1}, function (res) {
         let data = res.data;
         if (!data) {
             barData = {
@@ -342,7 +342,7 @@ function drawHandleByBarChart() {
 function drawHandleTypeByPieChart() {
     let pieData = [];
     get('/mail/queryToType', false, {
-        "type": 1
+        "type": 3
     }, function (res) {
         if (res.data) {
             pieData = res.data;

nngkxxdp/src/main/resources/static/page/index.html

@@ -1892,7 +1892,7 @@
                     }, 300);
                     break;
                 case "main-gkxx":
-                    $('#main-gkxx').attr('src', 'http://nazwfw.cqna.gov.cn/natj/enter_showLetterbox.html');
+                    $('#main-gkxx').attr('src', 'http://localhost:7777/natj/enter_showLetterbox.html');
                     clearInterval(timer);
                     clearInterval(time);
                     clearTimeout(t);