From 027d7c321c128327db4f1d5b5471af990a67df1a Mon Sep 17 00:00:00 2001 From: CODE <1650192445@qq.com> Date: Tue, 29 Aug 2023 16:03:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=86?= =?UTF-8?q?=E7=BB=84=E5=90=8D=E7=A7=B0=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/header/components/customProjGroupModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/client/src/layout/components/header/components/customProjGroupModal.jsx b/web/client/src/layout/components/header/components/customProjGroupModal.jsx index d660527..41afab4 100644 --- a/web/client/src/layout/components/header/components/customProjGroupModal.jsx +++ b/web/client/src/layout/components/header/components/customProjGroupModal.jsx @@ -52,7 +52,7 @@ const CustomProjGroupModal = (props) => { }}> {({ formState, values, formApi }) => ( <> - + { pomsList.map((item, index) => { From e346d199af9797ded89bfef1a9e8255ceb644565 Mon Sep 17 00:00:00 2001 From: CODE <1650192445@qq.com> Date: Tue, 29 Aug 2023 20:22:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=8E=87=E5=89=8D24?= =?UTF-8?q?=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/project/group.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/app/lib/controllers/project/group.js b/api/app/lib/controllers/project/group.js index 7f9f69a..bead78f 100644 --- a/api/app/lib/controllers/project/group.js +++ b/api/app/lib/controllers/project/group.js @@ -266,7 +266,7 @@ async function groupStatisticOnline (ctx) { "range": { "collect_time": { "gte": `${moment().subtract(24, 'hours').format('YYYY-MM-DDTHH:mm:ss.SSS')}Z`, - "gte": "2023-08-24T08:00:00.000Z", + // "gte": "2023-08-24T08:00:00.000Z", } } }, From e666272ec1e2e67988756a7d67fa012e103ca1de Mon Sep 17 00:00:00 2001 From: CODE <1650192445@qq.com> Date: Tue, 29 Aug 2023 20:22:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=8E=87=E5=89=8D24?= =?UTF-8?q?=E5=B0=8F=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/models/app_inspection.js | 172 +++++++++++++-------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/api/app/lib/models/app_inspection.js b/api/app/lib/models/app_inspection.js index 09e4751..b446b77 100644 --- a/api/app/lib/models/app_inspection.js +++ b/api/app/lib/models/app_inspection.js @@ -2,91 +2,91 @@ 'use strict'; module.exports = dc => { - const DataTypes = dc.ORM; - const sequelize = dc.orm; - const AppInspection = sequelize.define("appInspection", { - id: { - type: DataTypes.INTEGER, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: true, - field: "id", - autoIncrement: true, - unique: "app_inspection_id_uindex" - }, - projectAppId: { - type: DataTypes.INTEGER, - allowNull: true, - defaultValue: null, - comment: null, - primaryKey: false, - field: "project_app_id", - autoIncrement: false, - references: { - key: "id", - model: "app" + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const AppInspection = sequelize.define("appInspection", { + id: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true, + unique: "app_inspection_id_uindex" + }, + projectAppId: { + type: DataTypes.INTEGER, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "project_app_id", + autoIncrement: false, + references: { + key: "id", + model: "app" + } + }, + createTime: { + type: DataTypes.DATE, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: false, + field: "create_time", + autoIncrement: false + }, + screenshot: { + type: DataTypes.STRING, + allowNull: false, + defaultValue: null, + comment: "截图存储路径", + primaryKey: false, + field: "screenshot", + autoIncrement: false + }, + notedPepUserId: { + type: DataTypes.INTEGER, + allowNull: true, + defaultValue: null, + comment: "核验人员", + primaryKey: false, + field: "noted_pep_user_id", + autoIncrement: false + }, + notedTime: { + type: DataTypes.DATE, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "noted_time", + autoIncrement: false + }, + description: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "description", + autoIncrement: false + }, + router: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: null, + primaryKey: false, + field: "router", + autoIncrement: false } - }, - createTime: { - type: DataTypes.DATE, - allowNull: false, - defaultValue: null, - comment: null, - primaryKey: false, - field: "create_time", - autoIncrement: false - }, - screenshot: { - type: DataTypes.STRING, - allowNull: false, - defaultValue: null, - comment: "截图存储路径", - primaryKey: false, - field: "screenshot", - autoIncrement: false - }, - notedPepUserId: { - type: DataTypes.INTEGER, - allowNull: true, - defaultValue: null, - comment: "核验人员", - primaryKey: false, - field: "noted_pep_user_id", - autoIncrement: false - }, - notedTime: { - type: DataTypes.DATE, - allowNull: true, - defaultValue: null, - comment: null, - primaryKey: false, - field: "noted_time", - autoIncrement: false - }, - description: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: null, - primaryKey: false, - field: "description", - autoIncrement: false - }, - router: { - type: DataTypes.STRING, - allowNull: true, - defaultValue: null, - comment: null, - primaryKey: false, - field: "router", - autoIncrement: false - } - }, { - tableName: "app_inspection", - comment: "", - indexes: [] - }); - dc.models.AppInspection = AppInspection; - return AppInspection; + }, { + tableName: "app_inspection", + comment: "", + indexes: [] + }); + dc.models.AppInspection = AppInspection; + return AppInspection; }; \ No newline at end of file