From c91b045430de84d77e93140b5d9148dadb8ad404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=91=98=E5=B0=8F=E5=A2=A8?=
<2291200076@qq.com>
Date: Sun, 16 Apr 2023 00:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=A8=E7=A6=81=E7=AB=AF?=
=?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
TODOs.md | 12 ++---
.../main/resources/static/access/renderer.js | 47 ++++++++++---------
frontend/src/components/manage-list.vue | 3 +-
3 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/TODOs.md b/TODOs.md
index 677c67f..4e2377b 100644
--- a/TODOs.md
+++ b/TODOs.md
@@ -2,32 +2,30 @@
【想一想访客怎么处理】
-首页密码修改
+小程序首页密码修改
-大门人员进出后台管理
+大门 人员进出 后台管理（进出日志）
-首页加一个扫门禁码
+后台订单管理页
订单发货小程序端显示
小程序扫门禁码之后门禁开门(扫码 websocket 推到门禁端)
-门禁段显示大门开放状态
+门禁端左侧提示文字修改
后台管理两个端分开
体温上报添加一个按钮 可以删除当日填报
项目部署到服务器
-& 小程序提审（提审时隐藏小商店）
+& 小程序提审（提审时隐藏小商店 调试按钮、上帝按钮）
& 发给老班看一看
数据库填充测试数据(以及创建一些测试账号)并备份，线上演示数据修改删除避免真删
-小程序修改密码
-
# IP 配置
内网穿透：106.75.217.14
diff --git a/backend/microservice-provider-access-8002/src/main/resources/static/access/renderer.js b/backend/microservice-provider-access-8002/src/main/resources/static/access/renderer.js
index c8c3493..51c8576 100644
--- a/backend/microservice-provider-access-8002/src/main/resources/static/access/renderer.js
+++ b/backend/microservice-provider-access-8002/src/main/resources/static/access/renderer.js
@@ -18,6 +18,27 @@ window.gateList = []
// 当前大门
window.currentGate = null
+// 获取 Url 参数
+function getUrlParams() {
+ let params = {}
+ location.search.substring(1).split("&").map(param => {
+ let a = param.indexOf("=")
+ if (a < 0)
+ params[param] = ''
+ else
+ params[param.substring(0, a)] = decodeURIComponent(param.substring(a + 1))
+ })
+ // console.log(params)
+ return params
+}
+
+// 获取 url 参数
+let urlParams = getUrlParams()
+console.log("urlParams", urlParams)
+
+// 是否在 electron 中
+const inElectron = urlParams['inElectron']
+
// 点击全屏
document.getElementById("fullscreen-button").addEventListener("click", function () {
if (document.fullscreenElement) {
@@ -36,20 +57,6 @@ document.getElementById("fullscreen-button").addEventListener("click", function
}
})
-// 获取 Url 参数
-function getUrlParams() {
- let params = {}
- location.search.substring(1).split("&").map(param => {
- let a = param.indexOf("=")
- if (a < 0)
- params[param] = ''
- else
- params[param.substring(0, a)] = decodeURIComponent(param.substring(a + 1))
- })
- // console.log(params)
- return params
-}
-
// 定时更新页面上的小程序码
let i = 0, refreshTime = 10 + 1
@@ -101,12 +108,6 @@ async function getGateList() {
}
window.onload = async function () {
- // 获取 url 参数
- let urlParams = getUrlParams()
- console.log("urlParams", urlParams)
-
- // 是否在 electron 中
- const inElectron = urlParams['inElectron']
// 当前的门禁端
let gateId = urlParams['gateId'] || ""
@@ -135,7 +136,11 @@ window.onload = async function () {
// 弹出选择框
window.showSettingPanel && window.showSettingPanel()
} else {
- document.querySelector('#gate-name').textContent = window.currentGate.name
+ // 显示大门名称及状态
+ document.querySelector('#gate-name').innerHTML = `
+ ${window.currentGate.name}
+ ${window.currentGate.open ? '允许通行' : '禁止通行'}`
+
// 开始更新图片
updateQRCode()
setInterval(updateQRCode, 1000)
diff --git a/frontend/src/components/manage-list.vue b/frontend/src/components/manage-list.vue
index 06c4733..d96bdc9 100644
--- a/frontend/src/components/manage-list.vue
+++ b/frontend/src/components/manage-list.vue
@@ -483,10 +483,11 @@ const handleDelete = (index: number, row: any) => {
// 导出数据到文件
const handleExport = async () => {
- // 去除分页参数
let params = {};
+ // 如果选择仅导出满肚条件的数据，那么这里就填上查询参数
if (exportConfig.value.withFilter) {
params = JSON.parse(JSON.stringify(query))
+ // 去除分页参数
delete params["pageIndex"]
delete params["pageSize"]
}