diff --git a/src/main/resources/static/assets/web/css/style.css b/src/main/resources/static/assets/web/css/style.css index 0497253..fba7d7e 100644 --- a/src/main/resources/static/assets/web/css/style.css +++ b/src/main/resources/static/assets/web/css/style.css @@ -157,7 +157,7 @@ .main-list{margin-top:10px;min-height:400px} .main-list ul li{background:#fff;padding:20px;box-shadow:0 0 10px #eee;border-radius:5px;margin-bottom:10px} .main-list ul li:last-child{margin-bottom:0} -.main-list ul li .line{margin-bottom:10px;font-size:14px;color:#333} +.main-list ul li .line{margin-bottom:10px;font-size:16px;color:#333} .main-list ul li .line:last-child{margin-bottom:0} .main-list ul li .line span{font-weight:700;color:#3d41b7} .operation-btn{display:inline-block;width:90px;height:30px;border-radius:20px;font-size:14px;color:#fff;text-align:center;line-height:30px;margin-right:15px} diff --git a/src/main/resources/static/assets/web/images/five-title-icon.png b/src/main/resources/static/assets/web/images/five-title-icon.png new file mode 100644 index 0000000..1930fe4 Binary files /dev/null and b/src/main/resources/static/assets/web/images/five-title-icon.png differ diff --git a/src/main/resources/static/assets/web/images/four-title-icon.png b/src/main/resources/static/assets/web/images/four-title-icon.png new file mode 100644 index 0000000..8aa3f09 Binary files /dev/null and b/src/main/resources/static/assets/web/images/four-title-icon.png differ diff --git a/src/main/resources/static/assets/web/images/six-title-icon.png b/src/main/resources/static/assets/web/images/six-title-icon.png new file mode 100644 index 0000000..824ecbc Binary files /dev/null and b/src/main/resources/static/assets/web/images/six-title-icon.png differ diff --git a/src/main/resources/static/route/web/platform-show.html b/src/main/resources/static/route/web/platform-show.html index bd7af9a..1ddfc9a 100644 --- a/src/main/resources/static/route/web/platform-show.html +++ b/src/main/resources/static/route/web/platform-show.html @@ -6,82 +6,61 @@ 乡镇街道综合办公平台 +
-
-
@@ -149,7 +128,8 @@ bottomNavList: [], pageTitle: '', newsList: [], - loadLayerIndex: '' + loadLayerIndex: '', + weatherInfo: {} }, methods: { // 获取顶部导航 @@ -201,13 +181,38 @@ paging: function (page) { this.page.page = page this.getNewsList() - } + }, + // 获取天气 + getWeahther: function () { + var self = this + top.restAjax.get(top.restAjax.path('api/weather/get-weather-now', []), {}, null, function(code, data) { + self.weatherInfo = data + }, function(code, data) { + layer.msg(data.msg); + }, function() { + // loadLayerIndex = layer.load(0, {shade: false}); + }, function() { + // layer.close(loadLayerIndex); + }); + }, + // 获取日期 + getDate: function () { + var myDate = new Date; + var year = myDate.getFullYear(); //获取当前年 + var mon = myDate.getMonth() + 1; //获取当前月 + var date = myDate.getDate(); //获取当前日 + var week = myDate.getDay(); + var weeks = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"]; + this.today = year + "年" + mon + "月" + date + "日 " + weeks[week] + }, }, mounted: function () { // this.getTopNav() this.page.departmentId = restAjax.params(window.location.href).departmentId this.getGateNav() this.getNewsList() + this.getWeahther() + this.getDate() } }) diff --git a/src/main/resources/static/route/web/public.html b/src/main/resources/static/route/web/public.html index 1ac2b8d..44c5e97 100644 --- a/src/main/resources/static/route/web/public.html +++ b/src/main/resources/static/route/web/public.html @@ -63,6 +63,11 @@
+
+ + + +
指标状态占比统计