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

nngkxxdp/src/main/resources/static/mxt/js/index.js

@@ -4,7 +4,7 @@ layui.use('laydate', function () {
 
 // var topModule = ["重庆市南岸区人民政府", "南岸健康卫士", "南岸人力社保", "南岸公安", "南岸智慧城管", "遇见南坪"];
 var topModule = ['重庆市南岸区人民政府', '广阳湾智创生态城', '南岸文旅', '南岸健康卫士', '南岸公安', '重庆南岸消防'];
-var regionModule = ['重庆市政府网','中新互联互通项目','合川区人民政府', '黔江区人民政府', '大足区政府网', '重庆市北碚区人民政府', '重庆市江北区人民政府', '渝北政府网','巴南区政府网','重庆忠县政府网','渝中政府','巫山政务'];
+var regionModule = ['重庆市政府网', '中新互联互通项目', '合川区人民政府', '黔江区人民政府', '大足区政府网', '重庆市北碚区人民政府', '重庆市江北区人民政府', '渝北政府网', '巴南区政府网', '重庆忠县政府网', '渝中政府', '巫山政务'];
 var page = 1, limit = 12, regionlimit = 10;
 var topData = [];
 var ofaData = [];
@@ -233,7 +233,7 @@ function departments(index) {
             if (json.data) {
                 var data = json.data;
                 ofaData = data.ofa;
-                departmentLoad(ofaData,index);
+                departmentLoad(ofaData, index);
             }
         },
         error: function (e) {
@@ -241,7 +241,7 @@ function departments(index) {
     });
 }
 
-function departmentLoad(data,index) {
+function departmentLoad(data, index) {
     $('#department').empty();
     var html = '';
     var topHtml = '';
@@ -291,12 +291,12 @@ function departmentLoad(data,index) {
             + '	</div>';
     }
     $('#department').append(topHtml + html);
-    regionWeChartListByRight(regionModule[1],index);
+    regionWeChartListByRight(regionModule[1], index);
 }
-function departmentClick(that,index){
+function departmentClick(that, index) {
     page = 1;
 
-    regionWeChartListByRight($(that).find(".gzhtitie").text().trim(),index)
+    regionWeChartListByRight($(that).find(".gzhtitie").text().trim(), index)
     $(that).find(".gzh").addClass("gzh-active");
     $(that).find('.smgz-contanier').addClass('smgz-active');
     $(that).siblings('div').find(".gzh").removeClass("gzh-active");
@@ -322,7 +322,7 @@ function regionPage(index) {
             if (json.data) {
                 var data = json.data;
                 ofaData = data.ofa;
-                regionCenterByLeft(data.ofa,index);
+                regionCenterByLeft(data.ofa, index);
             }
         },
         error: function (e) {
@@ -332,7 +332,7 @@ function regionPage(index) {
 
 
 
-function regionCenterByLeft(data,index) {
+function regionCenterByLeft(data, index) {
     $('#regionchartList').empty();
     var html = '';
     var topHtml = '';
@@ -379,7 +379,7 @@ function regionCenterByLeft(data,index) {
             + '	</div>';
     }
     $('#regionchartList').append(topHtml + html);
-    regionWeChartListByRight(regionModule[0],index);
+    regionWeChartListByRight(regionModule[0], index);
 }
 function regionJrttList(data) {
     $('#jrttList').empty();
@@ -397,13 +397,13 @@ function regionJrttList(data) {
 }
 function regionClick(that) {
     page = 1;
-    regionWeChartListByRight($(that).find(".gzhtitie").text().trim(),2)
+    regionWeChartListByRight($(that).find(".gzhtitie").text().trim(), 2)
     $(that).find(".gzh").addClass("gzh-active");
     $(that).find('.smgz-contanier').addClass('smgz-active');
     $(that).siblings('div').find(".gzh").removeClass("gzh-active");
     $(that).siblings('div').find(".smgz-contanier").removeClass("smgz-active");
 }
-function regionWeChartListByRight(name,index) {
+function regionWeChartListByRight(name, index) {
     $.ajax({
         type: 'GET',
         url: '/article/getRegionOfficialAccountByPaging',
@@ -416,9 +416,9 @@ function regionWeChartListByRight(name,index) {
         success: function (json) {
             var more = '';
             if (page == 1) {
-                if(index==1){
+                if (index == 1) {
                     $('#departmentRight').empty();
-                }else if(index==2){
+                } else if (index == 2) {
                     $('#regionRightList').empty();
                 }
             }
@@ -436,10 +436,10 @@ function regionWeChartListByRight(name,index) {
                         + '<span>' + data[i].nowTime + '</span>'
                         + '</div>';
                 }
-                if(index==1){
-                    $('#departmentRight').append(html+more);
-                }else if(index==2){
-                    $('#regionRightList').append(html+more);
+                if (index == 1) {
+                    $('#departmentRight').append(html + more);
+                } else if (index == 2) {
+                    $('#regionRightList').append(html + more);
                 }
 
             }
@@ -451,11 +451,11 @@ function regionWeChartListByRight(name,index) {
 }
 function regionMoreClick(that, name) {
     $(that).remove();
-    var title=$(".layui-this").text();
-    if(title=='26重庆部门新媒体矩阵'){
-        regionWeChartListByRight(name,1);
-    }else if(title=='26重庆区县新媒体矩阵'){
-        regionWeChartListByRight(name,2);
+    let tabletext = $(".layui-tab-title .layui-this").text();
+    if (tabletext == '重庆部门新媒体矩阵') {
+        regionWeChartListByRight(name, 1);
+    } else if (tabletext == '重庆区县新媒体矩阵') {
+        regionWeChartListByRight(name, 2);
     }
 }
 
@@ -511,14 +511,14 @@ $(".box-nav").on('click', 'li', function () {
 })
 
 // 南岸区公众号矩阵的tab进行切换
-$(".content_gzh .layui-tab-title li").click(function(){
-    var tabText=$(this).text();
+$(".content_gzh .layui-tab-title li").click(function () {
+    var tabText = $(this).text();
     page = 1;
-    if (tabText=="重庆南岸区新媒体矩阵"){
+    if (tabText == "重庆南岸区新媒体矩阵") {
         initPage();
-    }else if(tabText=="重庆区县新媒体矩阵"){
+    } else if (tabText == "重庆区县新媒体矩阵") {
         regionPage(2);
-    }else if(tabText=="重庆部门新媒体矩阵"){
+    } else if (tabText == "重庆部门新媒体矩阵") {
         departments(1);
     }
 })

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/administration.vue

@@ -348,7 +348,7 @@
             </div>
             <el-form>
                 <el-form-item label="专辑名称" style="display: flex">
-                    <el-input v-model="modification.name" placeholder="请输入专辑名称" clearable>
+                    <el-input maxlength="10" v-model="modification.name" placeholder="请输入专辑名称" clearable>
                     </el-input>
                 </el-form-item>
 
@@ -381,7 +381,7 @@
             </div>
             <el-form>
                 <el-form-item label="专辑名称" style="display: flex">
-                    <el-input v-model="addWorkDialogs.ablumNames" placeholder="请输入专辑名称" clearable>
+                    <el-input maxlength="10" v-model="addWorkDialogs.ablumNames" placeholder="请输入专辑名称" clearable>
                     </el-input>
                 </el-form-item>
                 <el-upload action="#" ref="upload" :headers="importHeaders" :before-upload="addBeforeUpload"

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/vue.config.js

@@ -9,8 +9,8 @@ module.exports = {
             '/': {
                 // target:'http://192.168.0.230:7777/',//开发
                 // target:'http://192.168.0.7:7777/',//开发
-                // target:'http://192.168.1.253:7777/',//测试
-                target:'http://data.cqna.gov.cn/',//线上
+                target:'http://192.168.1.253:7777/',//测试
+                // target:'http://data.cqna.gov.cn/',//线上
                 changeOrigin: true,
                 pathRewrite: {
                     '^ /': ''

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

@@ -1 +1 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="css/app.72dc2e82.css" rel="preload" as="style"><link href="css/chunk-vendors.058a81fe.css" rel="preload" as="style"><link href="js/app.743f9e32.js" rel="preload" as="script"><link href="js/chunk-vendors.4c187b39.js" rel="preload" as="script"><link href="css/chunk-vendors.058a81fe.css" rel="stylesheet"><link href="css/app.72dc2e82.css" rel="stylesheet"></head><body><div id="app"></div><script src="js/chunk-vendors.4c187b39.js"></script><script src="js/app.743f9e32.js"></script></body></html>
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="css/app.9a449603.css" rel="preload" as="style"><link href="css/chunk-vendors.058a81fe.css" rel="preload" as="style"><link href="js/app.0e217c6b.js" rel="preload" as="script"><link href="js/chunk-vendors.4c187b39.js" rel="preload" as="script"><link href="css/chunk-vendors.058a81fe.css" rel="stylesheet"><link href="css/app.9a449603.css" rel="stylesheet"></head><body><div id="app"></div><script src="js/chunk-vendors.4c187b39.js"></script><script src="js/app.0e217c6b.js"></script></body></html>