diff --git a/api/app/lib/controllers/push/config.js b/api/app/lib/controllers/push/config.js
index c6382c8..3feedea 100644
--- a/api/app/lib/controllers/push/config.js
+++ b/api/app/lib/controllers/push/config.js
@@ -9,16 +9,19 @@ async function list (ctx) {
const { utils: { anxinStrucIdRange, pomsProjectRange } } = ctx.app.fs
const { keyword, keywordTarget, alarmType, state, tactics, pomsProjectId } = ctx.query
+ let projectCorrelationWhere = {
+ del: false,
+ }
+ if (state == 'notYet') {
+ projectCorrelationWhere.pepProjectId = { $ne: null }
+ }
let findOption = {
where: {
del: false
},
include: [{
model: models.ProjectCorrelation,
- where: {
- del: false,
- pepProjectId: state == 'notYet' ? { $ne: null } : undefined
- },
+ where: projectCorrelationWhere,
required: true
}]
}
diff --git a/web/client/index.ejs b/web/client/index.ejs
index 9cbe876..71b028e 100644
--- a/web/client/index.ejs
+++ b/web/client/index.ejs
@@ -11,7 +11,7 @@
-
+
diff --git a/web/client/index.html b/web/client/index.html
index 162fe74..302a7e4 100644
--- a/web/client/index.html
+++ b/web/client/index.html
@@ -11,7 +11,7 @@
+ src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_19077_11.559b91c217b8ddc76c0c4b1397d84d48.es5.js">
diff --git a/web/client/src/sections/install/containers/system.jsx b/web/client/src/sections/install/containers/system.jsx
index b33458f..69a80d1 100644
--- a/web/client/src/sections/install/containers/system.jsx
+++ b/web/client/src/sections/install/containers/system.jsx
@@ -273,7 +273,7 @@ const Example = (props) => {
修改
{//获取项企(PEP)全部部门及其下用户
+ dispatch(service.postPush({ pushId: editObj.id, ...obj, msg: '编辑推送配置' })).then((res) => {//获取项企(PEP)全部部门及其下用户
if (res.success) {
close();
}
@@ -567,7 +567,7 @@ function pushModal (props) {
placeholder="请选择通知时效"
style={{ width: 285 }}
rules={[{ required: true, message: "请选择通知时效" }]}
- initValue={editObj?.timeType.length > 0 ? editObj?.timeType : timeTypePOMS.current}
+ initValue={editObj?.timeType?.length > 0 ? editObj?.timeType : timeTypePOMS.current}
disabled={timeTypeDis}
multiple
maxTagCount={3}
diff --git a/web/client/src/sections/service/containers/emPush.jsx b/web/client/src/sections/service/containers/emPush.jsx
index 3772b80..1e1354a 100644
--- a/web/client/src/sections/service/containers/emPush.jsx
+++ b/web/client/src/sections/service/containers/emPush.jsx
@@ -662,6 +662,7 @@ const EmPush = (props) => {
marginLeft: 32
}}
onClick={() => {
+ setEditObj({})
setPushModal(true);
setPushEdit(false);
}}
@@ -688,7 +689,7 @@ const EmPush = (props) => {
hideExpandedColumn={false}
empty="暂无数据"
expandedRowRender={expandRowRender}
- pagination={false}
+ // pagination={false}
onRow={handleRow}
/>
diff --git a/web/client/src/sections/service/nav-item.jsx b/web/client/src/sections/service/nav-item.jsx
index 694b817..cd770ad 100644
--- a/web/client/src/sections/service/nav-item.jsx
+++ b/web/client/src/sections/service/nav-item.jsx
@@ -30,7 +30,7 @@ export function getNavItem (user, dispatch) {
}, {
itemKey: 'carrierPigeon',
text: '信鸽服务',
- icon: ,
+ icon: ,
to: '/service/carrierPigeon/emPush',
items: [{
itemKey: 'emPush', to: '/service/carrierPigeon/emPush', text: 'EM推送'
diff --git a/web/client/src/sections/service/style.less b/web/client/src/sections/service/style.less
index 7f2491d..d26536b 100644
--- a/web/client/src/sections/service/style.less
+++ b/web/client/src/sections/service/style.less
@@ -2,12 +2,4 @@
.semi-input-wrapper{
margin-bottom: 0px !important;
}
-}
-.emPushTable{
- // .semi-table-row-cell:first-child{
- // display: flex !important;
- // }
- // .semi-table-row-cell{
- // display: flex !important;
- // }
}
\ No newline at end of file