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

2 years ago · 0a284e7af8
8 changed files with 15 additions and 19 deletions
--- 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
         }]
      }
--- a/web/client/index.ejs
+++ b/web/client/index.ejs
@ -11,7 +11,7 @@
   <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 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>

 <body>
--- a/web/client/index.html
+++ b/web/client/index.html
@ -11,7 +11,7 @@
    <script>LA.init({ id: "Jo4eTlZVqgx3uwqm", ck: "Jo4eTlZVqgx3uwqm" })</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 >

        <body>
--- 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) => {
                            修改
                        </Button>
                        <Popconfirm
-                            title="删除后对应的项目全局将无法进入和显示，对应的信鸽服务也会被禁用"
+                            title="删除后对应的项目全局将无法进入和显示，对应的信鸽服务也会被删除"
                            arrowPointAtCenter={false}
                            showArrow={true}
                            position="topRight"
--- a/web/client/src/sections/service/components/pushModal.jsx
+++ b/web/client/src/sections/service/components/pushModal.jsx
@ -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) {
                            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}
--- 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}
                        />
                    </Skeleton>
--- 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: <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',
                        items: [{
                            itemKey: 'emPush', to: '/service/carrierPigeon/emPush', text: 'EM推送'
--- 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;
-    // }
 }