diff --git a/api/app/lib/index.js b/api/app/lib/index.js index 84559e9..fb167d3 100644 --- a/api/app/lib/index.js +++ b/api/app/lib/index.js @@ -58,7 +58,8 @@ module.exports.models = function (dc) { // dc = { orm: Sequelize对象, ORM: Seq }); const { - AppInspection, ProjectApp, ProjectCorrelation, AppAlarm, App, AlarmAppearRecord, AlarmConfirmLog, EmailSendLog, LatestDynamicList, AlarmPushConfig + AppInspection, ProjectApp, ProjectCorrelation, AppAlarm, App, AlarmAppearRecord, AlarmConfirmLog, EmailSendLog, LatestDynamicList, AlarmPushConfig, + AlarmDataContinuityType, AlarmDataContinuity } = dc.models; AppInspection.belongsTo(App, { foreignKey: 'projectAppId', targetKey: 'id' }); @@ -103,4 +104,7 @@ module.exports.models = function (dc) { // dc = { orm: Sequelize对象, ORM: Seq LatestDynamicList.belongsTo(ProjectCorrelation, { foreignKey: 'projectCorrelationId', targetKey: 'id' }); ProjectCorrelation.hasMany(LatestDynamicList, { foreignKey: 'projectCorrelationId', sourceKey: 'id' }); + + AlarmDataContinuityType.belongsTo(AlarmDataContinuity, { foreignKey: 'typeNumber', targetKey: 'type' }); + AlarmDataContinuity.hasOne(AlarmDataContinuityType, { foreignKey: 'typeNumber', sourceKey: 'type' }); }; diff --git a/web/client/src/sections/data/actions/console.js b/web/client/src/sections/data/actions/console.js deleted file mode 100644 index ff08638..0000000 --- a/web/client/src/sections/data/actions/console.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -import { ApiTable ,basicAction} from '$utils' - -// export function getMembers (orgId) { -// return dispatch => basicAction({ -// type: 'get', -// dispatch: dispatch, -// actionType: 'GET_MEMBERS', -// url: `${ApiTable.getEnterprisesMembers.replace('{enterpriseId}', orgId)}`, -// msg: { error: '获取用户列表失败' }, -// reducer: { name: 'members' } -// }); -// } diff --git a/web/client/src/sections/data/style.less b/web/client/src/sections/data/style.less index 75ecdb6..e69de29 100644 --- a/web/client/src/sections/data/style.less +++ b/web/client/src/sections/data/style.less @@ -1,7 +0,0 @@ -#example { - box-shadow: 3px 3px 2px black; -} - -#example:hover { - color: yellowgreen; -} \ No newline at end of file diff --git a/web/package.json b/web/package.json index 4d5046f..4e07fdb 100644 --- a/web/package.json +++ b/web/package.json @@ -63,11 +63,13 @@ "echarts": "^5.3.3", "echarts-for-react": "^3.0.2", "ezuikit-js": "^0.6.1", + "file-saver": "^2.0.5", "fs-attachment": "^1.0.0", "fs-web-server-scaffold": "^1.0.6", "koa-better-http-proxy": "^0.2.5", "koa-proxy": "^1.0.0-alpha.3", "koa-view": "^2.1.4", + "mhtml-to-word": "^1.0.4", "moment": "^2.29.3", "npm": "^7.20.6", "perfect-scrollbar": "^1.5.5", @@ -83,4 +85,4 @@ "webpack-dev-server": "^3.11.2", "webpack-hot-middleware": "^2.25.0" } -} \ No newline at end of file +}