From 72d4462e86b133fff0addcb6ddff9c34d3184c95 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 10 Feb 2023 17:39:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/nk/Community.php |   4 +-
 app/admin/controller/nk/User.php      |  17 +-
 app/admin/view/index/main.html        | 465 --------------------------
 app/admin/view/nk/user/auths.html     |   1 +
 4 files changed, 7 insertions(+), 480 deletions(-)
 delete mode 100644 app/admin/view/index/main.html

diff --git a/app/admin/controller/nk/Community.php b/app/admin/controller/nk/Community.php
index 6f4b190..07c8f17 100644
--- a/app/admin/controller/nk/Community.php
+++ b/app/admin/controller/nk/Community.php
@@ -8,7 +8,7 @@ use think\facade\View;
 
 
 /**
- * 文章投诉
+ * 村民互动(逛逛)
  *
  * @icon fa fa-circle-o
  */
@@ -38,7 +38,6 @@ class Community extends BaseController
         if (request()->isAjax()) {
             $params= get_params();
             $where['status']=1;
-            $where = [];
             if (isset($params['keywords'])){
 //                $where[]=['title','like','%'.$params['keywords'].'%'];
             }
@@ -57,7 +56,6 @@ class Community extends BaseController
                     $where['village_id'] = '';
                 }
             }
-
             $total = Db::connect('shop')->name('community_address')
                 ->where($where)
                 ->count();
diff --git a/app/admin/controller/nk/User.php b/app/admin/controller/nk/User.php
index 2549c64..07b9c6c 100644
--- a/app/admin/controller/nk/User.php
+++ b/app/admin/controller/nk/User.php
@@ -44,16 +44,14 @@ class User extends BaseController
 
                 $map[] = ['m.phone', 'LIKE', '%' . $post['phone'] . '%'];
             }
-
             //权限组信息
             if ($this->adminInfo['group_access'] != 1) {
                 $find = Db::table('fa_szxc_information_useraddress')->where('admin_id', $this->adminInfo['id'])->find();
                 if ($find) {
                     if ($find['auth_range'] == 1) {
-                        $mmm['village_id'] = $find['village_id'];
-                    } elseif ($find['auth_range'] == 2) {
+                        $mmm['area_id'] = $find['area_id'];
                         $mmm['street_id'] = $find['street_id'];
-                    } elseif ($find['auth_range'] == 3) {
+                    } elseif ($find['auth_range'] == 2) {
                         $mmm['area_id'] = $find['area_id'];
                     }
                 }
@@ -72,14 +70,11 @@ class User extends BaseController
                     $mmm['brigade_id'] = $post['brigade_id'];
                 }
             }
-
             //权限组信息
             $total = Db::table('fa_szxc_information_usermsg')
                 ->alias('m')
                 ->where($mmm)
                 ->where($map)
-                ->join(['fa_user' => 'u'], 'm.user_id=u.id')
-                ->join(['fa_user_group' => 'g'], 'g.id=u.group_id')
                 ->count();
             $list = Db::table('fa_szxc_information_usermsg')
                 ->alias('m')
@@ -743,14 +738,12 @@ class User extends BaseController
         $find = Db::table('fa_szxc_information_useraddress')->where('user_id', $this->adminInfo['user_id'])->find();
         if ($find) {
             if ($find['auth_range'] == 1) {
-                $where['village_id'] = $find['village_id'];
+                $mmm['area_id'] = $find['area_id'];
+                $mmm['street_id'] = $find['street_id'];
             } elseif ($find['auth_range'] == 2) {
-                $where['street_id'] = $find['street_id'];
-            } elseif ($find['auth_range'] == 3) {
-                $where['area_id'] = $find['area_id'];
+                $mmm['area_id'] = $find['area_id'];
             }
         }
-
         if (!empty($post['village_id'])) {
             $where['village_id'] = $post['village_id'];
         }
diff --git a/app/admin/view/index/main.html b/app/admin/view/index/main.html
deleted file mode 100644
index 8db5333..0000000
--- a/app/admin/view/index/main.html
+++ /dev/null
@@ -1,465 +0,0 @@
-{extend name="common/base"/}
-{block name="style"}
-<style type="text/css">
-	.dashboard-num table {width: 100%;}
-	.dashboard-num td {text-align: center; padding: 16px 0; width: 20%;border-left: 1px solid #f1f1f1; position: relative;}
-	.dashboard-num td:nth-child(1) { border-left: none}
-	.dashboard-num .num-title { padding-bottom: 10px; color: #999;}
-	.dashboard-num .blue {font-size: 20px; font-weight: 300;}
-	.dashboard-num td .badge {position: absolute;top: 0; right: 0;}
-	.dashboard-num td .badge span { padding: 2px 4px; font-size: 12px; border-radius: 0 0 0 4px;}
-	.dashboard-total td {border-top: 1px solid #f1f1f1}
-	.dashboard-logs .layui-timeline-item {padding-bottom: 1px;}
-	.info-td { width: 90px; text-align: right;background-color: #fafafa; color: #999; padding: 5px 3px;}
-	.info-td {width: 90px; text-align: right;background-color: #fafafa; color: #999; padding: 5px 3px;}
-	.layui-card-body .layui-timeline-title {
-		padding-bottom: 0;
-		font-size: 14px;
-	}
-	.layui-card-body .layui-timeline-item {
-		padding-bottom: 5px;
-	}
-</style>
-{/block}
-<!-- 主体 -->
-{block name="body"}
-<div class="p-3">
-	<div class="layui-row layui-col-space12">
-		<div class="">
-			<div class="layui-row layui-col-space12">
-				<div class="layui-col-md12">
-					<div class="layui-card dashboard-num">
-						<table>
-							<tr>
-								<td>
-									<div class="num-title">总会员数</div>
-									<div class="blue">{$totaluser}</div>
-								</td>
-								<td>
-									<div class="num-title">老人人数</div>
-									<div class="blue">{$old_num}</div>
-								</td>
-								<td>
-									<div class="num-title">儿童人数</div>
-									<div class="blue">{$children_num}</div>
-								</td>
-								<td>
-									<div class="num-title">未婚男</div>
-									<div class="blue">{$unmarried_man_num}</div>
-								</td>
-								<td>
-									<div class="num-title">未婚女</div>
-									<div class="blue">{$unmarried_woman_num}</div>
-								</td>
-							</tr>
-							<tr>
-
-								<td>
-									<div class="num-title">残疾人数</div>
-									<div class="blue">{$whether_disabled_num}</div>
-								</td>
-								<td>
-									<div class="num-title">参保人数</div>
-									<div class="blue">{$insurance_type_num}</div>
-								</td>
-								<td>
-									<div class="num-title">少数名族人数</div>
-									<div class="blue">{$nation_s_num}</div>
-								</td>
-								<td>
-									<div class="num-title">汉族人数</div>
-									<div class="blue">{$nation_h_num}</div>
-								</td>
-								<td>
-									<div class="num-title">工作人员数</div>
-									<div class="blue">{$work_num}</div>
-								</td>
-							</tr>
-						</table>
-					</div>
-
-					<div class="layui-card dashboard-num">
-						<table>
-							<tr>
-								<td>
-									<div class="num-title">土地总面积</div>
-									<div class="blue">{$land_area_num}</div>
-								</td>
-								<td>
-									<div class="num-title">荒地</div>
-									<div class="blue">{$waste_land_area}</div>
-								</td>
-								<td>
-									<div class="num-title">农田水利</div>
-									<div class="blue">{$sum_218}</div>
-								</td>
-								<td>
-									<div class="num-title">坑塘</div>
-									<div class="blue">{$sum_217}</div>
-								</td>
-								<td>
-									<div class="num-title">养殖</div>
-									<div class="blue">{$sum_216}</div>
-								</td>
-							</tr>
-							<tr>
-								<td>
-									<div class="num-title">牧草地</div>
-									<div class="blue">{$sum_215}</div>
-								</td>
-								<td>
-									<div class="num-title">林地</div>
-									<div class="blue">{$sum_214}</div>
-								</td>
-								<td>
-									<div class="num-title">耕地</div>
-									<div class="blue">{$sum_70}</div>
-								</td>
-								<td>
-									<div class="num-title">园地</div>
-									<div class="blue">{$sum_69}</div>
-								</td>
-							</tr>
-						</table>
-					</div>
-					<div class="layui-card">
-						<div id="chartYear" style="width: 100%;height:240px;"></div>
-					</div>
-
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-{/block}
-<!-- /主体 -->
-
-<!-- 脚本 -->
-{block name="script"}
-<script src="https://cdn.staticfile.org/echarts/5.3.0/echarts.min.js"></script>
-<script>
-	function getLogs() {
-		$.ajax({
-			url: "/admin/api/get_log_list",
-			type: 'post',
-			data: {
-				page: 1,
-				limit: 20
-			},
-			success: function (e) {
-				if (e.code == 0) {
-					var html = '';
-					$.each(e.data, function (key, value) {
-						html += '<li class="layui-timeline-item">\
-										<i class="layui-icon layui-timeline-axis"></i>\
-										<div class="layui-timeline-content layui-text">\
-										  <div class="layui-timeline-title"><span title="'+ value.id + '">' + value.times + '</span>，' + value.content + '</div>\
-										</div>\
-									  </li>';
-					});
-					$('#logs').html(html);
-				}
-			}
-		})
-	}
-
-	const moduleInit = ['tool'];
-	function gouguInit() {
-		var table = layui.table;
-		$('body').on('click','[data-event="pay"]',function(){
-			var src=$(this).attr('src');
-			layer.open({
-				type:1,
-				title:'感谢您给作者加鸡腿🍗🍗',
-				content:'<img src="'+src+'" style="width:100%" align=center />',
-			});
-		})
-		// getLogs();
-		//注册用户
-		table.render({
-			elem: '#UserList'
-			, url: '/admin/api/get_user_list' //数据接口
-			, page: false //开启分页
-			, cols: [[ //表头
-				{ field: 'username', title: '用户名'}
-				,{ field: 'username', title: '昵称', align: 'center', 'width': 120}
-				,{ field: 'sex', title: '性别','width': 60, align: 'center', templet: function (d) {
-						let str='-';
-						if(d.sex==1){
-							str='男';
-						}
-						else if(d.sex==2){
-							str='女';
-						}
-						return str;
-					}}
-				, {
-					field: 'headimgurl', title: '头像', align: 'center','width': 60, templet: function (d) {
-						return '<img src="' + d.headimgurl + '" width="20" height="20" />';
-					}
-				}
-				, { field: 'login_num', title: '登录次数', align: 'center','width': 100}
-				, { field: 'last_login_time', title: '最后登录时间', align: 'center','width': 168}
-			]]
-		});
-
-		//文章
-		table.render({
-			elem: '#Article'
-			, url: '/admin/api/get_article_list' //数据接口
-			, page: false //开启分页
-			, cols: [[ //表头
-				{ field: 'title', title: '文章标题'}
-				, { field: 'cate_title', title: '文章分类', align: 'center','width': 150 }
-				, { field: 'read', title: '访问量', align: 'center','width': 100 }
-				, { field: 'create_time', title: '发布时间', align: 'center','width': 168}
-			]]
-		});
-		// get_view_data();
-	}
-
-
-	function setHour(num) {
-		var str = num + ':00';
-		if (num < 10) {
-			str = '0' + num + ':00';
-		}
-		return str;
-	}
-	var chartView = echarts.init(document.getElementById('chartView'));
-	function get_view_data() {
-		$.ajax({
-			url: "/admin/api/get_view_data",
-			type: 'post',
-			data: {},
-			success: function (e) {
-				if (e.code == 0) {
-					var data_first = e.data.data_first;
-					var data_second = e.data.data_second;
-					archiveCalendar = e.data.data_three;
-					var myDate = new Date();
-					var nowHour = myDate.getHours(); //获取当前小时数(0-23)
-					var xData = [];
-					var yData1 = [];
-					var yData2 = [];
-					$.each(data_first, function (key, value) {
-						if (key <= nowHour) {
-							yData1.push(value);
-						}
-					});
-					$.each(data_second, function (key, value) {
-						xData.push(setHour(key));
-						yData2.push(value);
-					});
-					var ops = {
-						title: {
-							top: '12px',
-							text: '今日与昨日访问统计',
-							left: '10px',
-							textStyle: {
-								fontSize: '18',
-								color: '#333',
-							}
-						},
-						color: ["#1AAD19", "#1890FF"],
-						grid: {
-							left: '16px',
-							right: '30px',
-							bottom: '12px',
-							top: '60px',
-							containLabel: true
-						},
-						tooltip: {
-							trigger: 'axis',
-							axisPointer: {
-								type: 'cross',
-								crossStyle: {
-									color: '#999'
-								}
-							}
-						},
-						toolbox: {
-							show: true,
-						},
-						legend: {
-							data: ["今日", "昨日"],
-							top: '16px',
-						},
-						xAxis: [{
-							type: "category",
-							boundaryGap: !1,
-							data: xData,
-							axisLine: {
-								lineStyle: {
-									color: '#999999',
-									width: 1,
-								}
-							},
-						}],
-						yAxis: [{
-							type: "value",
-							axisLine: {
-								show: true,
-								lineStyle: {
-									color: '#999999',
-									width: 1,
-								}
-							},
-						}],
-						series: [{
-							name: "今日",
-							type: "line",
-							smooth: !0,
-							itemStyle: {
-								normal: {
-									areaStyle: {
-										type: "default",
-										opacity: 0.2
-									}
-								}
-							},
-							data: yData1
-						}, {
-							name: "昨日",
-							type: "line",
-							smooth: !0,
-							itemStyle: {
-								normal: {
-									areaStyle: {
-										type: "default",
-										opacity: 0.2
-									}
-								}
-							},
-							data: yData2
-						}]
-					}
-					chartView.setOption(ops);
-
-
-					let myChart = echarts.init(document.getElementById('chartYear'));
-					let option = {
-						title: {
-							top: '12px',
-							text: '近一年访问统计',
-							left: '10px',
-							textStyle: {
-								fontSize: '18',
-								color: '#333',
-							}
-						},
-						tooltip: {
-							padding: 6,
-							formatter: function (obj) {
-								var value = obj.value;
-								return '<div style="font-size: 12px;">' + value[0] + '：' + value[1] + ' 个访客</div>';
-							}
-						},
-						visualMap: {
-							min: 0,
-							max: 300,
-							show: false,
-							inRange: {
-								color: ['#fafafa', '#1AAD19']
-							}
-						},
-						calendar: {
-							top: 75,
-							left: 50,
-							right: 20,
-							range: getRange(),
-							cellSize: ['auto', 21],
-							splitLine: {
-								lineStyle: {
-									color: '#aaa',
-									type: 'dashed'
-								}
-							},
-							itemStyle: {
-								borderWidth: 0.5
-							},
-							yearLabel: { show: false },
-							monthLabel: {
-								nameMap: 'cn',
-								fontSize: 12
-							},
-							dayLabel: {
-								show: true,
-								formatter: '{start}  1st',
-								fontWeight: 'lighter',
-								nameMap: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
-								fontSize: 12
-							}
-						},
-						series: [{
-							type: 'heatmap',
-							coordinateSystem: 'calendar',
-							calendarIndex: 0,
-							data: getDay()
-						}]
-					};
-					myChart.setOption(option);
-
-					setTimeout(function () {
-						window.onresize = function () {
-							chartView.resize();
-							myChart.resize();
-						}
-					})
-					console.log(e.data);
-				}
-			}
-		})
-
-		var archiveCalendar = {};
-		function getRange() {
-			let today = new Date();
-			let tYear = today.getFullYear();
-			let tMonth = today.getMonth() + 1;
-			let tDate = today.getDate();
-			let dateFirst = tYear + "-" + tMonth + "-" + tDate;
-			let datelast = (tYear - 1) + "-" + tMonth + "-" + tDate;
-			let dataRange = [];
-			dataRange.push(dateFirst);
-			dataRange.push(datelast);
-			return dataRange;
-		}
-
-		function getDay() {
-			var today = new Date();
-			var dayArray = [];
-			for (var i = 0; i < 366; i++) {
-				var targetday_milliseconds = today.getTime() - 1000 * 60 * 60 * 24 * i;
-				var date = new Date(targetday_milliseconds);
-				dayArray.push(retunDay(date));
-			}
-			return dayArray;
-		}
-
-		function retunDay(day) {
-			var tYear = day.getFullYear();
-			var tMonth = day.getMonth();
-			var tDate = day.getDate();
-			tMonth = tMonth + 1;
-			if (tMonth.toString().length == 1) {
-				tMonth = "0" + tMonth;
-			}
-			if (tDate.toString().length == 1) {
-				tDate = "0" + tDate;
-			}
-			var dateStr = tYear + "-" + tMonth + "-" + tDate;
-			var dateArray = [];
-			dateArray.push(dateStr);
-			if (archiveCalendar[dateStr]) {
-				dateArray.push(archiveCalendar[dateStr]);
-			}
-			else {
-				dateArray.push(0);
-			}
-			return dateArray;
-		}
-	}
-
-</script>
-{/block}
-<!-- /脚本 -->
\ No newline at end of file
diff --git a/app/admin/view/nk/user/auths.html b/app/admin/view/nk/user/auths.html
index 5cf1ef7..567cc53 100644
--- a/app/admin/view/nk/user/auths.html
+++ b/app/admin/view/nk/user/auths.html
@@ -42,6 +42,7 @@
 			{volist name='street' id='vo'}
 			{if $address.area_id==$vo.code}
 			<input type="text" value="{$vo.name}" autocomplete="off" class="layui-input" disabled>
+			<input type="hidden" value="{$vo.code}" name="area_id" autocomplete="off" class="layui-input" disabled>
 			{/if}
 			{/volist}
 			{/if}

From 2322b52676ebc34599a0cf38c031319353a2de40 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 10 Feb 2023 17:41:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/index/main.html | 465 +++++++++++++++++++++++++++++++++
 1 file changed, 465 insertions(+)
 create mode 100644 app/admin/view/index/main.html

diff --git a/app/admin/view/index/main.html b/app/admin/view/index/main.html
new file mode 100644
index 0000000..8db5333
--- /dev/null
+++ b/app/admin/view/index/main.html
@@ -0,0 +1,465 @@
+{extend name="common/base"/}
+{block name="style"}
+<style type="text/css">
+	.dashboard-num table {width: 100%;}
+	.dashboard-num td {text-align: center; padding: 16px 0; width: 20%;border-left: 1px solid #f1f1f1; position: relative;}
+	.dashboard-num td:nth-child(1) { border-left: none}
+	.dashboard-num .num-title { padding-bottom: 10px; color: #999;}
+	.dashboard-num .blue {font-size: 20px; font-weight: 300;}
+	.dashboard-num td .badge {position: absolute;top: 0; right: 0;}
+	.dashboard-num td .badge span { padding: 2px 4px; font-size: 12px; border-radius: 0 0 0 4px;}
+	.dashboard-total td {border-top: 1px solid #f1f1f1}
+	.dashboard-logs .layui-timeline-item {padding-bottom: 1px;}
+	.info-td { width: 90px; text-align: right;background-color: #fafafa; color: #999; padding: 5px 3px;}
+	.info-td {width: 90px; text-align: right;background-color: #fafafa; color: #999; padding: 5px 3px;}
+	.layui-card-body .layui-timeline-title {
+		padding-bottom: 0;
+		font-size: 14px;
+	}
+	.layui-card-body .layui-timeline-item {
+		padding-bottom: 5px;
+	}
+</style>
+{/block}
+<!-- 主体 -->
+{block name="body"}
+<div class="p-3">
+	<div class="layui-row layui-col-space12">
+		<div class="">
+			<div class="layui-row layui-col-space12">
+				<div class="layui-col-md12">
+					<div class="layui-card dashboard-num">
+						<table>
+							<tr>
+								<td>
+									<div class="num-title">总会员数</div>
+									<div class="blue">{$totaluser}</div>
+								</td>
+								<td>
+									<div class="num-title">老人人数</div>
+									<div class="blue">{$old_num}</div>
+								</td>
+								<td>
+									<div class="num-title">儿童人数</div>
+									<div class="blue">{$children_num}</div>
+								</td>
+								<td>
+									<div class="num-title">未婚男</div>
+									<div class="blue">{$unmarried_man_num}</div>
+								</td>
+								<td>
+									<div class="num-title">未婚女</div>
+									<div class="blue">{$unmarried_woman_num}</div>
+								</td>
+							</tr>
+							<tr>
+
+								<td>
+									<div class="num-title">残疾人数</div>
+									<div class="blue">{$whether_disabled_num}</div>
+								</td>
+								<td>
+									<div class="num-title">参保人数</div>
+									<div class="blue">{$insurance_type_num}</div>
+								</td>
+								<td>
+									<div class="num-title">少数名族人数</div>
+									<div class="blue">{$nation_s_num}</div>
+								</td>
+								<td>
+									<div class="num-title">汉族人数</div>
+									<div class="blue">{$nation_h_num}</div>
+								</td>
+								<td>
+									<div class="num-title">工作人员数</div>
+									<div class="blue">{$work_num}</div>
+								</td>
+							</tr>
+						</table>
+					</div>
+
+					<div class="layui-card dashboard-num">
+						<table>
+							<tr>
+								<td>
+									<div class="num-title">土地总面积</div>
+									<div class="blue">{$land_area_num}</div>
+								</td>
+								<td>
+									<div class="num-title">荒地</div>
+									<div class="blue">{$waste_land_area}</div>
+								</td>
+								<td>
+									<div class="num-title">农田水利</div>
+									<div class="blue">{$sum_218}</div>
+								</td>
+								<td>
+									<div class="num-title">坑塘</div>
+									<div class="blue">{$sum_217}</div>
+								</td>
+								<td>
+									<div class="num-title">养殖</div>
+									<div class="blue">{$sum_216}</div>
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<div class="num-title">牧草地</div>
+									<div class="blue">{$sum_215}</div>
+								</td>
+								<td>
+									<div class="num-title">林地</div>
+									<div class="blue">{$sum_214}</div>
+								</td>
+								<td>
+									<div class="num-title">耕地</div>
+									<div class="blue">{$sum_70}</div>
+								</td>
+								<td>
+									<div class="num-title">园地</div>
+									<div class="blue">{$sum_69}</div>
+								</td>
+							</tr>
+						</table>
+					</div>
+					<div class="layui-card">
+						<div id="chartYear" style="width: 100%;height:240px;"></div>
+					</div>
+
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+{/block}
+<!-- /主体 -->
+
+<!-- 脚本 -->
+{block name="script"}
+<script src="https://cdn.staticfile.org/echarts/5.3.0/echarts.min.js"></script>
+<script>
+	function getLogs() {
+		$.ajax({
+			url: "/admin/api/get_log_list",
+			type: 'post',
+			data: {
+				page: 1,
+				limit: 20
+			},
+			success: function (e) {
+				if (e.code == 0) {
+					var html = '';
+					$.each(e.data, function (key, value) {
+						html += '<li class="layui-timeline-item">\
+										<i class="layui-icon layui-timeline-axis"></i>\
+										<div class="layui-timeline-content layui-text">\
+										  <div class="layui-timeline-title"><span title="'+ value.id + '">' + value.times + '</span>，' + value.content + '</div>\
+										</div>\
+									  </li>';
+					});
+					$('#logs').html(html);
+				}
+			}
+		})
+	}
+
+	const moduleInit = ['tool'];
+	function gouguInit() {
+		var table = layui.table;
+		$('body').on('click','[data-event="pay"]',function(){
+			var src=$(this).attr('src');
+			layer.open({
+				type:1,
+				title:'感谢您给作者加鸡腿🍗🍗',
+				content:'<img src="'+src+'" style="width:100%" align=center />',
+			});
+		})
+		// getLogs();
+		//注册用户
+		table.render({
+			elem: '#UserList'
+			, url: '/admin/api/get_user_list' //数据接口
+			, page: false //开启分页
+			, cols: [[ //表头
+				{ field: 'username', title: '用户名'}
+				,{ field: 'username', title: '昵称', align: 'center', 'width': 120}
+				,{ field: 'sex', title: '性别','width': 60, align: 'center', templet: function (d) {
+						let str='-';
+						if(d.sex==1){
+							str='男';
+						}
+						else if(d.sex==2){
+							str='女';
+						}
+						return str;
+					}}
+				, {
+					field: 'headimgurl', title: '头像', align: 'center','width': 60, templet: function (d) {
+						return '<img src="' + d.headimgurl + '" width="20" height="20" />';
+					}
+				}
+				, { field: 'login_num', title: '登录次数', align: 'center','width': 100}
+				, { field: 'last_login_time', title: '最后登录时间', align: 'center','width': 168}
+			]]
+		});
+
+		//文章
+		table.render({
+			elem: '#Article'
+			, url: '/admin/api/get_article_list' //数据接口
+			, page: false //开启分页
+			, cols: [[ //表头
+				{ field: 'title', title: '文章标题'}
+				, { field: 'cate_title', title: '文章分类', align: 'center','width': 150 }
+				, { field: 'read', title: '访问量', align: 'center','width': 100 }
+				, { field: 'create_time', title: '发布时间', align: 'center','width': 168}
+			]]
+		});
+		// get_view_data();
+	}
+
+
+	function setHour(num) {
+		var str = num + ':00';
+		if (num < 10) {
+			str = '0' + num + ':00';
+		}
+		return str;
+	}
+	var chartView = echarts.init(document.getElementById('chartView'));
+	function get_view_data() {
+		$.ajax({
+			url: "/admin/api/get_view_data",
+			type: 'post',
+			data: {},
+			success: function (e) {
+				if (e.code == 0) {
+					var data_first = e.data.data_first;
+					var data_second = e.data.data_second;
+					archiveCalendar = e.data.data_three;
+					var myDate = new Date();
+					var nowHour = myDate.getHours(); //获取当前小时数(0-23)
+					var xData = [];
+					var yData1 = [];
+					var yData2 = [];
+					$.each(data_first, function (key, value) {
+						if (key <= nowHour) {
+							yData1.push(value);
+						}
+					});
+					$.each(data_second, function (key, value) {
+						xData.push(setHour(key));
+						yData2.push(value);
+					});
+					var ops = {
+						title: {
+							top: '12px',
+							text: '今日与昨日访问统计',
+							left: '10px',
+							textStyle: {
+								fontSize: '18',
+								color: '#333',
+							}
+						},
+						color: ["#1AAD19", "#1890FF"],
+						grid: {
+							left: '16px',
+							right: '30px',
+							bottom: '12px',
+							top: '60px',
+							containLabel: true
+						},
+						tooltip: {
+							trigger: 'axis',
+							axisPointer: {
+								type: 'cross',
+								crossStyle: {
+									color: '#999'
+								}
+							}
+						},
+						toolbox: {
+							show: true,
+						},
+						legend: {
+							data: ["今日", "昨日"],
+							top: '16px',
+						},
+						xAxis: [{
+							type: "category",
+							boundaryGap: !1,
+							data: xData,
+							axisLine: {
+								lineStyle: {
+									color: '#999999',
+									width: 1,
+								}
+							},
+						}],
+						yAxis: [{
+							type: "value",
+							axisLine: {
+								show: true,
+								lineStyle: {
+									color: '#999999',
+									width: 1,
+								}
+							},
+						}],
+						series: [{
+							name: "今日",
+							type: "line",
+							smooth: !0,
+							itemStyle: {
+								normal: {
+									areaStyle: {
+										type: "default",
+										opacity: 0.2
+									}
+								}
+							},
+							data: yData1
+						}, {
+							name: "昨日",
+							type: "line",
+							smooth: !0,
+							itemStyle: {
+								normal: {
+									areaStyle: {
+										type: "default",
+										opacity: 0.2
+									}
+								}
+							},
+							data: yData2
+						}]
+					}
+					chartView.setOption(ops);
+
+
+					let myChart = echarts.init(document.getElementById('chartYear'));
+					let option = {
+						title: {
+							top: '12px',
+							text: '近一年访问统计',
+							left: '10px',
+							textStyle: {
+								fontSize: '18',
+								color: '#333',
+							}
+						},
+						tooltip: {
+							padding: 6,
+							formatter: function (obj) {
+								var value = obj.value;
+								return '<div style="font-size: 12px;">' + value[0] + '：' + value[1] + ' 个访客</div>';
+							}
+						},
+						visualMap: {
+							min: 0,
+							max: 300,
+							show: false,
+							inRange: {
+								color: ['#fafafa', '#1AAD19']
+							}
+						},
+						calendar: {
+							top: 75,
+							left: 50,
+							right: 20,
+							range: getRange(),
+							cellSize: ['auto', 21],
+							splitLine: {
+								lineStyle: {
+									color: '#aaa',
+									type: 'dashed'
+								}
+							},
+							itemStyle: {
+								borderWidth: 0.5
+							},
+							yearLabel: { show: false },
+							monthLabel: {
+								nameMap: 'cn',
+								fontSize: 12
+							},
+							dayLabel: {
+								show: true,
+								formatter: '{start}  1st',
+								fontWeight: 'lighter',
+								nameMap: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+								fontSize: 12
+							}
+						},
+						series: [{
+							type: 'heatmap',
+							coordinateSystem: 'calendar',
+							calendarIndex: 0,
+							data: getDay()
+						}]
+					};
+					myChart.setOption(option);
+
+					setTimeout(function () {
+						window.onresize = function () {
+							chartView.resize();
+							myChart.resize();
+						}
+					})
+					console.log(e.data);
+				}
+			}
+		})
+
+		var archiveCalendar = {};
+		function getRange() {
+			let today = new Date();
+			let tYear = today.getFullYear();
+			let tMonth = today.getMonth() + 1;
+			let tDate = today.getDate();
+			let dateFirst = tYear + "-" + tMonth + "-" + tDate;
+			let datelast = (tYear - 1) + "-" + tMonth + "-" + tDate;
+			let dataRange = [];
+			dataRange.push(dateFirst);
+			dataRange.push(datelast);
+			return dataRange;
+		}
+
+		function getDay() {
+			var today = new Date();
+			var dayArray = [];
+			for (var i = 0; i < 366; i++) {
+				var targetday_milliseconds = today.getTime() - 1000 * 60 * 60 * 24 * i;
+				var date = new Date(targetday_milliseconds);
+				dayArray.push(retunDay(date));
+			}
+			return dayArray;
+		}
+
+		function retunDay(day) {
+			var tYear = day.getFullYear();
+			var tMonth = day.getMonth();
+			var tDate = day.getDate();
+			tMonth = tMonth + 1;
+			if (tMonth.toString().length == 1) {
+				tMonth = "0" + tMonth;
+			}
+			if (tDate.toString().length == 1) {
+				tDate = "0" + tDate;
+			}
+			var dateStr = tYear + "-" + tMonth + "-" + tDate;
+			var dateArray = [];
+			dateArray.push(dateStr);
+			if (archiveCalendar[dateStr]) {
+				dateArray.push(archiveCalendar[dateStr]);
+			}
+			else {
+				dateArray.push(0);
+			}
+			return dateArray;
+		}
+	}
+
+</script>
+{/block}
+<!-- /脚本 -->
\ No newline at end of file

From c132eb31973bb514160a4febc84b4dd66901e1f2 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 10 Feb 2023 18:32:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/nk/agrotechnical/index.html       | 1 -
 app/admin/view/nk/article/index.html             | 1 -
 app/admin/view/nk/broadcast/index.html           | 1 -
 app/admin/view/nk/comment/index.html             | 1 -
 app/admin/view/nk/community/index.html           | 1 -
 app/admin/view/nk/complaint/index.html           | 1 -
 app/admin/view/nk/farmers/index.html             | 1 -
 app/admin/view/nk/maturity/index.html            | 1 -
 app/admin/view/nk/merchant/index.html            | 1 -
 app/admin/view/nk/party/article/index.html       | 1 -
 app/admin/view/nk/party/branch/index.html        | 1 -
 app/admin/view/nk/party/branchpaylist/index.html | 1 -
 app/admin/view/nk/party/branchpayuser/index.html | 1 -
 app/admin/view/nk/party/info/index.html          | 1 -
 app/admin/view/nk/party/vote/index.html          | 1 -
 app/admin/view/nk/party/votecomment/index.html   | 1 -
 app/admin/view/nk/policy/index.html              | 1 -
 app/admin/view/nk/products/index.html            | 1 -
 app/admin/view/nk/regioncommission/index.html    | 1 -
 app/admin/view/nk/seekers/index.html             | 1 -
 app/admin/view/nk/skills/index.html              | 1 -
 app/admin/view/nk/slide/index.html               | 1 -
 app/admin/view/nk/slideinfo/index.html           | 1 -
 app/admin/view/nk/spread/index.html              | 1 -
 app/admin/view/nk/street/index.html              | 1 -
 app/admin/view/nk/transaction/index.html         | 1 -
 app/admin/view/nk/vegetable/index.html           | 1 -
 app/admin/view/nk/village/index.html             | 1 -
 app/admin/view/nk/welfare/index.html             | 1 -
 app/api/controller/Census.php                    | 2 +-
 30 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/app/admin/view/nk/agrotechnical/index.html b/app/admin/view/nk/agrotechnical/index.html
index 106b167..04928d0 100644
--- a/app/admin/view/nk/agrotechnical/index.html
+++ b/app/admin/view/nk/agrotechnical/index.html
@@ -47,7 +47,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/article/index.html b/app/admin/view/nk/article/index.html
index 65b9c11..9af757a 100644
--- a/app/admin/view/nk/article/index.html
+++ b/app/admin/view/nk/article/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/broadcast/index.html b/app/admin/view/nk/broadcast/index.html
index 875e5db..2621f11 100644
--- a/app/admin/view/nk/broadcast/index.html
+++ b/app/admin/view/nk/broadcast/index.html
@@ -43,7 +43,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/comment/index.html b/app/admin/view/nk/comment/index.html
index e3bc290..6544394 100644
--- a/app/admin/view/nk/comment/index.html
+++ b/app/admin/view/nk/comment/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/community/index.html b/app/admin/view/nk/community/index.html
index 2b9c2e6..8ff064d 100644
--- a/app/admin/view/nk/community/index.html
+++ b/app/admin/view/nk/community/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/complaint/index.html b/app/admin/view/nk/complaint/index.html
index b106912..becc18d 100644
--- a/app/admin/view/nk/complaint/index.html
+++ b/app/admin/view/nk/complaint/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/farmers/index.html b/app/admin/view/nk/farmers/index.html
index 106b167..04928d0 100644
--- a/app/admin/view/nk/farmers/index.html
+++ b/app/admin/view/nk/farmers/index.html
@@ -47,7 +47,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/maturity/index.html b/app/admin/view/nk/maturity/index.html
index 991a424..c72ee8d 100644
--- a/app/admin/view/nk/maturity/index.html
+++ b/app/admin/view/nk/maturity/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/merchant/index.html b/app/admin/view/nk/merchant/index.html
index 9ccd509..96bbd9d 100644
--- a/app/admin/view/nk/merchant/index.html
+++ b/app/admin/view/nk/merchant/index.html
@@ -35,7 +35,6 @@
             url: '{$url[0]}',
             page: true,
             limit: 20,
-            cellMinWidth: 300,
             cols: [
                 [
                     {
diff --git a/app/admin/view/nk/party/article/index.html b/app/admin/view/nk/party/article/index.html
index 39a60f8..ce2fa79 100644
--- a/app/admin/view/nk/party/article/index.html
+++ b/app/admin/view/nk/party/article/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/party/branch/index.html b/app/admin/view/nk/party/branch/index.html
index 5c498c1..7fdba7d 100644
--- a/app/admin/view/nk/party/branch/index.html
+++ b/app/admin/view/nk/party/branch/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/party/branchpaylist/index.html b/app/admin/view/nk/party/branchpaylist/index.html
index 0df5f3e..a148904 100644
--- a/app/admin/view/nk/party/branchpaylist/index.html
+++ b/app/admin/view/nk/party/branchpaylist/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/party/branchpayuser/index.html b/app/admin/view/nk/party/branchpayuser/index.html
index 7026ba0..fc5e1aa 100644
--- a/app/admin/view/nk/party/branchpayuser/index.html
+++ b/app/admin/view/nk/party/branchpayuser/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/party/info/index.html b/app/admin/view/nk/party/info/index.html
index 7c0ae57..df66300 100644
--- a/app/admin/view/nk/party/info/index.html
+++ b/app/admin/view/nk/party/info/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/party/vote/index.html b/app/admin/view/nk/party/vote/index.html
index 5d67965..3bb2ed4 100644
--- a/app/admin/view/nk/party/vote/index.html
+++ b/app/admin/view/nk/party/vote/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/party/votecomment/index.html b/app/admin/view/nk/party/votecomment/index.html
index f496804..4bf83b6 100644
--- a/app/admin/view/nk/party/votecomment/index.html
+++ b/app/admin/view/nk/party/votecomment/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/policy/index.html b/app/admin/view/nk/policy/index.html
index 106b167..04928d0 100644
--- a/app/admin/view/nk/policy/index.html
+++ b/app/admin/view/nk/policy/index.html
@@ -47,7 +47,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/products/index.html b/app/admin/view/nk/products/index.html
index f40fc18..28c9181 100644
--- a/app/admin/view/nk/products/index.html
+++ b/app/admin/view/nk/products/index.html
@@ -47,7 +47,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/regioncommission/index.html b/app/admin/view/nk/regioncommission/index.html
index e8f16b1..9d612f1 100644
--- a/app/admin/view/nk/regioncommission/index.html
+++ b/app/admin/view/nk/regioncommission/index.html
@@ -78,7 +78,6 @@
             url: '{$url[0]}',
             page: true,
             limit: 20,
-            cellMinWidth: 300,
             cols: [
                 [
                     {
diff --git a/app/admin/view/nk/seekers/index.html b/app/admin/view/nk/seekers/index.html
index 106b167..04928d0 100644
--- a/app/admin/view/nk/seekers/index.html
+++ b/app/admin/view/nk/seekers/index.html
@@ -47,7 +47,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/skills/index.html b/app/admin/view/nk/skills/index.html
index 106b167..04928d0 100644
--- a/app/admin/view/nk/skills/index.html
+++ b/app/admin/view/nk/skills/index.html
@@ -47,7 +47,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/slide/index.html b/app/admin/view/nk/slide/index.html
index 2b808f4..92c52da 100644
--- a/app/admin/view/nk/slide/index.html
+++ b/app/admin/view/nk/slide/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/slideinfo/index.html b/app/admin/view/nk/slideinfo/index.html
index 5bc8f14..1af3251 100644
--- a/app/admin/view/nk/slideinfo/index.html
+++ b/app/admin/view/nk/slideinfo/index.html
@@ -47,7 +47,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/spread/index.html b/app/admin/view/nk/spread/index.html
index 6e3723c..b564ee4 100644
--- a/app/admin/view/nk/spread/index.html
+++ b/app/admin/view/nk/spread/index.html
@@ -78,7 +78,6 @@
             url: '{$url[0]}',
             page: true,
             limit: 20,
-            cellMinWidth: 300,
             cols: [
                 [
                     {
diff --git a/app/admin/view/nk/street/index.html b/app/admin/view/nk/street/index.html
index 5179344..0f511db 100644
--- a/app/admin/view/nk/street/index.html
+++ b/app/admin/view/nk/street/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/transaction/index.html b/app/admin/view/nk/transaction/index.html
index 106b167..04928d0 100644
--- a/app/admin/view/nk/transaction/index.html
+++ b/app/admin/view/nk/transaction/index.html
@@ -47,7 +47,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/vegetable/index.html b/app/admin/view/nk/vegetable/index.html
index 106b167..04928d0 100644
--- a/app/admin/view/nk/vegetable/index.html
+++ b/app/admin/view/nk/vegetable/index.html
@@ -47,7 +47,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/village/index.html b/app/admin/view/nk/village/index.html
index 8d66918..4e0e2c4 100644
--- a/app/admin/view/nk/village/index.html
+++ b/app/admin/view/nk/village/index.html
@@ -45,7 +45,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/admin/view/nk/welfare/index.html b/app/admin/view/nk/welfare/index.html
index 106b167..04928d0 100644
--- a/app/admin/view/nk/welfare/index.html
+++ b/app/admin/view/nk/welfare/index.html
@@ -47,7 +47,6 @@
 			url: '{$url[0]}',
 			page: true,
 			limit: 20,
-			cellMinWidth: 300,
 			cols: [
 				[
 				{
diff --git a/app/api/controller/Census.php b/app/api/controller/Census.php
index a9ca965..eec227c 100644
--- a/app/api/controller/Census.php
+++ b/app/api/controller/Census.php
@@ -58,7 +58,7 @@ class Census extends BaseController
         $num_1 = Db::connect('shop')->table('eb_merchant')->alias('a')->join('eb_merchant_address b','a.mer_id = b.mer_id')->where($mmm)->where($map)->count();
 
         //企业通过我们平台采购的农产品(差用户标签条件)
-        $num_3 = Db::connect('shop')->table('eb_user')->alias('a')->join('eb_nk_user b','a.uid = b.user_id')->join('eb_product_order_log c','a.uid = c.uid')->join('nk_lihaink_cn.fa_szxc_information_useraddress d','b.n_user_id = d.user_id')->where($www)->where('a.status',1)->where('c.status',1)->count();
+        $num_3 = Db::connect('shop')->table('eb_user')->alias('a')->join('eb_nk_user b','a.uid = b.user_id')->join(['eb_product_order_log'=>'c'],'a.uid = c.uid')->join('nk_lihaink_cn.fa_szxc_information_useraddress d','b.n_user_id = d.user_id')->where($www)->where('a.status',1)->where('c.status',1)->count();
 
         //镇农产品需求量分析（事业单位、企业、居民）
         //农产品市场行情分析、显示