free-sun
/
OperationalService
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

dev
wuqun 2 years ago
parent
c8d59856c9 ab6f9fbd28
commit
0a284e7af8
8 changed files with 15 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      api/app/lib/controllers/push/config.js
  2. 2
      web/client/index.ejs
  3. 2
      web/client/index.html
  4. 2
      web/client/src/sections/install/containers/system.jsx
  5. 4
      web/client/src/sections/service/components/pushModal.jsx
  6. 3
      web/client/src/sections/service/containers/emPush.jsx
  7. 2
      web/client/src/sections/service/nav-item.jsx
  8. 8
      web/client/src/sections/service/style.less

11
api/app/lib/controllers/push/config.js
View File

@ -9,16 +9,19 @@ async function list (ctx) {
const { utils: { anxinStrucIdRange, pomsProjectRange } } = ctx.app.fs const { utils: { anxinStrucIdRange, pomsProjectRange } } = ctx.app.fs
const { keyword, keywordTarget, alarmType, state, tactics, pomsProjectId } = ctx.query const { keyword, keywordTarget, alarmType, state, tactics, pomsProjectId } = ctx.query
let projectCorrelationWhere = {
del: false,
}
if (state == 'notYet') {
projectCorrelationWhere.pepProjectId = { $ne: null }
}
let findOption = { let findOption = {
where: { where: {
del: false del: false
}, },
include: [{ include: [{
model: models.ProjectCorrelation, model: models.ProjectCorrelation,
where: { where: projectCorrelationWhere,
del: false,
pepProjectId: state == 'notYet' ? { $ne: null } : undefined
},
required: true required: true
}] }]
} }

2
web/client/index.ejs
View File

@ -11,7 +11,7 @@
<script charset="UTF-8" id="LA_COLLECT" src="//sdk.51.la/js-sdk-pro.min.js"></script> <script charset="UTF-8" id="LA_COLLECT" src="//sdk.51.la/js-sdk-pro.min.js"></script>
<script>LA.init({ id: "Jo4eTlZVqgx3uwqm", ck: "Jo4eTlZVqgx3uwqm" })</script> <script>LA.init({ id: "Jo4eTlZVqgx3uwqm", ck: "Jo4eTlZVqgx3uwqm" })</script>
<script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_19077_10.1efd80a22a5e53e48737fd5ab150ffd2.es5.js"></script> <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_19077_11.559b91c217b8ddc76c0c4b1397d84d48.es5.js"></script>
</head> </head>
<body> <body>

2
web/client/index.html
View File

@ -11,7 +11,7 @@
<script>LA.init({ id: "Jo4eTlZVqgx3uwqm", ck: "Jo4eTlZVqgx3uwqm" })</script> <script>LA.init({ id: "Jo4eTlZVqgx3uwqm", ck: "Jo4eTlZVqgx3uwqm" })</script>
<script <script
src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_19077_11.27aacefc59cea1cbc86236576463a6d2.es5.js"></script> src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_19077_11.559b91c217b8ddc76c0c4b1397d84d48.es5.js"></script>
</head > </head >
<body> <body>

2
web/client/src/sections/install/containers/system.jsx
View File

@ -273,7 +273,7 @@ const Example = (props) => {
修改 修改
</Button> </Button>
<Popconfirm <Popconfirm
title="删除后对应的项目全局将无法进入和显示，对应的信鸽服务也会被禁用" title="删除后对应的项目全局将无法进入和显示，对应的信鸽服务也会被删除"
arrowPointAtCenter={false} arrowPointAtCenter={false}
showArrow={true} showArrow={true}
position="topRight" position="topRight"

4
web/client/src/sections/service/components/pushModal.jsx
View File

@ -224,7 +224,7 @@ function pushModal (props) {
}) })
} }
} }
dispatch(service.postPush({ pushId: pushId, ...obj, msg: '编辑推送配置' })).then((res) => {//获取项企(PEP)全部部门及其下用户 dispatch(service.postPush({ pushId: editObj.id, ...obj, msg: '编辑推送配置' })).then((res) => {//获取项企(PEP)全部部门及其下用户
if (res.success) { if (res.success) {
close(); close();
} }
@ -567,7 +567,7 @@ function pushModal (props) {
placeholder="请选择通知时效" placeholder="请选择通知时效"
style={{ width: 285 }} style={{ width: 285 }}
rules={[{ required: true, message: "请选择通知时效" }]} rules={[{ required: true, message: "请选择通知时效" }]}
initValue={editObj?.timeType.length > 0 ? editObj?.timeType : timeTypePOMS.current} initValue={editObj?.timeType?.length > 0 ? editObj?.timeType : timeTypePOMS.current}
disabled={timeTypeDis} disabled={timeTypeDis}
multiple multiple
maxTagCount={3} maxTagCount={3}

3
web/client/src/sections/service/containers/emPush.jsx
View File

@ -662,6 +662,7 @@ const EmPush = (props) => {
marginLeft: 32 marginLeft: 32
}} }}
onClick={() => { onClick={() => {
setEditObj({})
setPushModal(true); setPushModal(true);
setPushEdit(false); setPushEdit(false);
}} }}
@ -688,7 +689,7 @@ const EmPush = (props) => {
hideExpandedColumn={false} hideExpandedColumn={false}
empty="暂无数据" empty="暂无数据"
expandedRowRender={expandRowRender} expandedRowRender={expandRowRender}
pagination={false} // pagination={false}
onRow={handleRow} onRow={handleRow}
/> />
</Skeleton> </Skeleton>

2
web/client/src/sections/service/nav-item.jsx
View File

@ -30,7 +30,7 @@ export function getNavItem (user, dispatch) {
}, { }, {
itemKey: 'carrierPigeon', itemKey: 'carrierPigeon',
text: '信鸽服务', text: '信鸽服务',
icon: <iconpark-icon style={{ width: 20, height: 20 }} name="iconjianshezhong"></iconpark-icon>, icon: <iconpark-icon style={{ width: 20, height: 20 }} name="xingefuwu"></iconpark-icon>,
to: '/service/carrierPigeon/emPush', to: '/service/carrierPigeon/emPush',
items: [{ items: [{
itemKey: 'emPush', to: '/service/carrierPigeon/emPush', text: 'EM推送' itemKey: 'emPush', to: '/service/carrierPigeon/emPush', text: 'EM推送'

8
web/client/src/sections/service/style.less
View File

@ -2,12 +2,4 @@
.semi-input-wrapper{ .semi-input-wrapper{
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
}
.emPushTable{
// .semi-table-row-cell:first-child{
// display: flex !important;
// }
// .semi-table-row-cell{
// display: flex !important;
// }
} }
Write Preview
Loading…
Cancel
Save