From ee4e5d53e0a2f420b55ce1877ba5c20ffee212fa Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Mon, 26 Sep 2022 16:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=8C=89=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/alarm/data.js | 10 ++++++----
 web/Dockerfile                        |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js
index 00c969e..77cc073 100644
--- a/api/app/lib/controllers/alarm/data.js
+++ b/api/app/lib/controllers/alarm/data.js
@@ -53,8 +53,8 @@ async function list (ctx) {
             whereOption.push(`alarms.AlarmGroupUnit=${groupUnitId}`)
          }
          if (sustainTimeStart && sustainTimeEnd) {
-            let momentStart = moment(sustainTimeStart).format()
-            let momentEnd = moment(sustainTimeEnd).format()
+            let momentStart = moment(sustainTimeStart).format('YYYY-MM-DD HH:mm:ss')
+            let momentEnd = moment(sustainTimeEnd).format('YYYY-MM-DD HH:mm:ss')
             whereOption.push(`
                (
                   alarms."StartTime"
@@ -91,8 +91,7 @@ async function list (ctx) {
                alarms.StructureId AS StructureId,
                ${anxinyun}.t_structure.name AS StructureName,
                ${anxinyun}.t_alarm_code.name AS AlarmCodeName,
-               AlarmContent,
-               ${anxinyun}.t_alarm_type.old_name AS alarmTypeOldName
+               AlarmContent
             FROM 
                alarms 
             LEFT JOIN ${anxinyun}.t_structure 
@@ -107,6 +106,9 @@ async function list (ctx) {
             ${limit && page ? 'OFFSET ' + parseInt(limit) * parseInt(page) : ''}
          `).toPromise();
 
+         // ,
+         // ${anxinyun}.t_alarm_type.old_name AS alarmTypeOldName
+
          // State = 3 是 自动恢复 / 4 是 人工恢复 / 其他数字 是 需要恢复
          // state = 2 是 等级提升 / 1 是持续产生 / 0 是首次产生
 
diff --git a/web/Dockerfile b/web/Dockerfile
index 12a6800..3991885 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -24,7 +24,7 @@
 # CMD ["node", "server.js"]
 
 
-# 就版本构建方式
+# 旧版本构建方式
 
 
 FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2