seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

pull/92/MERGE
13621160019@163.com 2021-12-05 22:46:03 +08:00
parent 150791963f 5d1e469894
commit fd0d66cf1c
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
myems-api/core/webmessage.py
View File

@ -127,7 +127,7 @@ class WebMessageCollection:
meta_result = {"id": row[0], meta_result = {"id": row[0],
"subject": row[1], "subject": row[1],
"message": row[2].replace("<br>", ""), "message": row[2].replace("<br>", ""),
"created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None, "created_datetime": row[3].timestamp() * 1000 if isinstance(row[3], datetime) else None,
"status": row[4], "status": row[4],
"reply": row[5]} "reply": row[5]}
result.append(meta_result) result.append(meta_result)
@ -228,7 +228,7 @@ class WebMessageStatusNewCollection:
meta_result = {"id": row[0], meta_result = {"id": row[0],
"subject": row[1], "subject": row[1],
"message": row[2].replace("<br>", ""), "message": row[2].replace("<br>", ""),
"created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None, "created_datetime": row[3].timestamp() * 1000 if isinstance(row[3], datetime) else None,
"status": row[4], "status": row[4],
"reply": row[5]} "reply": row[5]}
result.append(meta_result) result.append(meta_result)
@ -333,7 +333,7 @@ class WebMessageItem:
meta_result = {"id": row[0], meta_result = {"id": row[0],
"subject": row[1], "subject": row[1],
"message": row[2].replace("<br>", ""), "message": row[2].replace("<br>", ""),
"created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None, "created_datetime": row[3].timestamp() * 1000 if isinstance(row[3], datetime) else None,
"status": row[4], "status": row[4],
"reply": row[5]} "reply": row[5]}

3
web/Dockerfile vendored
View File

@ -1,8 +1,7 @@
FROM nginx:1.21.1 FROM nginx:1.21.1
# remove the default config # remove the default config
RUN rm /etc/nginx/conf.d/default.conf && \ RUN rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/nginx.conf
rm /etc/nginx/nginx.conf && \
# create new root folder # create new root folder
RUN mkdir -p /var/www/html/web RUN mkdir -p /var/www/html/web

6
web/src/components/MyEMS/Notification/Notification.js
View File

@ -62,9 +62,9 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => {
let isResponseOK = false; let isResponseOK = false;
if (!fetchSuccess) { if (!fetchSuccess) {
fetch(APIBaseURL + '/webmessagesnew?' + fetch(APIBaseURL + '/webmessages' +
'startdatetime=' + startDatetime.format('YYYY-MM-DDTHH:mm:ss') + '/from/' + startDatetime.format('YYYY-MM-DD') +
'&enddatetime=' + endDatetime.format('YYYY-MM-DDTHH:mm:ss'), { '/to/' + endDatetime.format('YYYY-MM-DD'), {
method: 'GET', method: 'GET',
headers: { headers: {
"Content-type": "application/json", "Content-type": "application/json",