From 9888d9f59ec1ad34f120b27bd19513d7a4f6f371 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 15 May 2025 16:44:58 +0800
Subject: [PATCH] no message

---
 public/images/application/okr-analyze.svg     |  1 -
 public/images/application/okr.svg             |  1 -
 .../assets/js/components/MicroApps/index.vue  |  3 ++
 .../assets/js/pages/manage/application.vue    | 35 ++++++++----
 .../pages/manage/components/DialogWrapper.vue | 18 +++++--
 resources/assets/js/store/actions.js          | 54 +++++++++++--------
 resources/assets/js/store/getters.js          | 33 ++++++++++++
 resources/assets/js/store/state.js            |  3 ++
 resources/assets/sass/pages/page-apply.scss   |  8 ---
 .../public/images/application/okr-analyze.svg |  1 -
 .../statics/public/images/application/okr.svg |  1 -
 11 files changed, 111 insertions(+), 47 deletions(-)
 delete mode 100644 public/images/application/okr-analyze.svg
 delete mode 100644 public/images/application/okr.svg
 delete mode 100644 resources/assets/statics/public/images/application/okr-analyze.svg
 delete mode 100644 resources/assets/statics/public/images/application/okr.svg

diff --git a/public/images/application/okr-analyze.svg b/public/images/application/okr-analyze.svg
deleted file mode 100644
index 6270061a6..000000000
--- a/public/images/application/okr-analyze.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="52" height="52" viewBox="0 0 52 52"><defs><clipPath id="master_svg0_3138_30094"><rect x="12" y="12" width="28" height="28" rx="0"/></clipPath></defs><g><rect x="0" y="0" width="52" height="52" rx="12" fill="#FFAA6B" fill-opacity="1"/><g clip-path="url(#master_svg0_3138_30094)"><g><path d="M35.4072,13L16.5768,13C14.60395,13,13,14.60395,13,16.5768L13,35.4232C13,37.379999999999995,14.60395,38.984,16.5768,38.984L35.4232,38.984C37.396100000000004,38.984,39,37.379999999999995,39,35.4072L39,16.5768C38.984,14.58791,37.396100000000004,13,35.4072,13ZM21.48489,32.1351C21.48489,32.1993,21.48489,32.2795,21.46885,32.343599999999995C21.45281,32.4078,21.43677,32.471900000000005,21.404690000000002,32.536100000000005C21.37261,32.6002,21.34053,32.6644,21.30845,32.7286C21.22825,32.8408,21.13202,32.9531,21.01974,33.0173C20.95558,33.0494,20.89142,33.0814,20.82727,33.1135C20.76311,33.1456,20.68291,33.1616,20.61875,33.1777C20.5546,33.1937,20.4744,33.1937,20.41024,33.1937C20.34608,33.1937,20.26588,33.1937,20.20173,33.1777C20.13757,33.1616,20.07341,33.1456,20.00925,33.1135C19.94509,33.0814,19.88094,33.0494,19.81678,33.0173C19.75262,32.9852,19.7045,32.9371,19.65638,32.888999999999996C19.60827,32.8408,19.56015,32.776700000000005,19.51203,32.7286C19.47995,32.6644,19.44787,32.6002,19.41579,32.536100000000005C19.38371,32.471900000000005,19.36767,32.4078,19.35163,32.327600000000004C19.33559,32.263400000000004,19.33559,32.1832,19.33559,32.1191L19.33559,23.8908C19.33559,23.8106,19.33559,23.746499999999997,19.35163,23.682299999999998C19.36767,23.6181,19.38371,23.554000000000002,19.41579,23.489800000000002C19.44787,23.4257,19.47995,23.3615,19.51203,23.2973C19.59223,23.1851,19.68846,23.0728,19.80074,23.0086C19.8649,22.97656,19.92905,22.928440000000002,19.99321,22.912399999999998C20.05737,22.880319999999998,20.12153,22.86428,20.20173,22.84824C20.26588,22.8322,20.34608,22.81616,20.41024,22.8322C20.4744,22.8322,20.5546,22.8322,20.61875,22.84824C20.68291,22.86428,20.74707,22.880319999999998,20.811230000000002,22.912399999999998C20.87538,22.94448,20.93954,22.97656,21.003700000000002,23.0086C21.11598,23.0888,21.22825,23.1851,21.29241,23.2973C21.32449,23.3615,21.37261,23.4257,21.38865,23.489800000000002C21.42073,23.554000000000002,21.43677,23.6181,21.45281,23.6983C21.46884,23.7625,21.46884,23.8427,21.46884,23.9068Q21.48489,23.9068,21.48489,32.1351ZM27.0987,32.0709C27.0987,32.1351,27.0987,32.2153,27.082700000000003,32.2795C27.0666,32.343599999999995,27.0506,32.4078,27.0185,32.471900000000005C26.9864,32.536100000000005,26.9543,32.6002,26.9223,32.6644C26.8902,32.7286,26.842100000000002,32.776700000000005,26.794,32.824799999999996C26.7458,32.8729,26.6817,32.921,26.6336,32.9692C26.5694,33.0012,26.505200000000002,33.0333,26.4411,33.0654C26.3769,33.0975,26.3128,33.1135,26.232599999999998,33.1295C26.1684,33.1456,26.0882,33.1456,26.0241,33.1456C25.959899999999998,33.1456,25.8797,33.1456,25.8155,33.1295C25.7514,33.1135,25.6872,33.0975,25.6231,33.0654C25.5589,33.0333,25.494799999999998,33.0012,25.4306,32.9692C25.3183,32.888999999999996,25.206,32.792699999999996,25.1419,32.6804C25.1098,32.616299999999995,25.061700000000002,32.552099999999996,25.0456,32.488C25.0136,32.4238,24.997500000000002,32.3596,24.9815,32.2795C24.9655,32.2153,24.9655,32.1351,24.9655,32.0709L24.9655,19.88094C24.9655,19.81678,24.9655,19.73658,24.9815,19.67242C24.997500000000002,19.60827,25.0136,19.52807,25.0456,19.47995C25.0777,19.41579,25.1098,19.35163,25.1419,19.287480000000002C25.222099999999998,19.1752,25.3183,19.06292,25.4306,18.99877C25.494799999999998,18.96669,25.5589,18.91857,25.6231,18.90253C25.6872,18.870449999999998,25.7514,18.85441,25.8316,18.83837C25.9759,18.80629,26.1203,18.80629,26.2486,18.83837C26.3128,18.85441,26.3769,18.870449999999998,26.4411,18.90253C26.505200000000002,18.93461,26.5694,18.96669,26.6336,18.99877C26.7458,19.078960000000002,26.8581,19.1752,26.9223,19.287480000000002C26.9543,19.35163,26.9864,19.41579,27.0185,19.47995C27.0506,19.54411,27.0666,19.62431,27.082700000000003,19.68846C27.0987,19.75262,27.0987,19.832819999999998,27.0987,19.89698L27.0987,32.0709ZM32.616299999999995,32.0709C32.616299999999995,32.1351,32.616299999999995,32.2153,32.6002,32.2795C32.584199999999996,32.343599999999995,32.568200000000004,32.4078,32.536100000000005,32.471900000000005C32.504000000000005,32.536100000000005,32.471900000000005,32.6002,32.4399,32.6644C32.359700000000004,32.776700000000005,32.263400000000004,32.888999999999996,32.1511,32.9531C32.087,32.9852,32.022800000000004,33.0333,31.9587,33.0494C31.8945,33.0814,31.8304,33.0975,31.7502,33.1135C31.686,33.1295,31.6058,33.1295,31.5416,33.1295C31.4775,33.1295,31.3973,33.1295,31.3331,33.1135C31.269,33.0975,31.2048,33.0814,31.1407,33.0494C31.0765,33.0173,31.0123,32.9852,30.9482,32.9531C30.8359,32.8729,30.7236,32.776700000000005,30.6595,32.6644C30.6274,32.6002,30.5793,32.536100000000005,30.5632,32.471900000000005C30.5312,32.4078,30.5151,32.343599999999995,30.4991,32.263400000000004C30.483,32.1993,30.483,32.1191,30.483,32.0549L30.483,28.173299999999998C30.483,28.1092,30.483,28.029,30.4991,27.9648C30.5151,27.9007,30.5312,27.8365,30.5632,27.772399999999998C30.5953,27.708199999999998,30.6274,27.644,30.6595,27.579900000000002C30.7397,27.467599999999997,30.8359,27.3553,30.9482,27.2912C31.0123,27.2591,31.0765,27.211,31.1407,27.1949C31.2048,27.1629,31.269,27.1468,31.3492,27.1308C31.4133,27.1147,31.4935,27.1147,31.5577,27.1147C31.6218,27.1147,31.702,27.1147,31.7662,27.1308C31.8304,27.1468,31.8945,27.1629,31.9587,27.1949C32.022800000000004,27.227,32.087,27.2591,32.1511,27.2912C32.263400000000004,27.3714,32.375699999999995,27.467599999999997,32.4399,27.579900000000002C32.471900000000005,27.644,32.519999999999996,27.708199999999998,32.536100000000005,27.772399999999998C32.568200000000004,27.8365,32.584199999999996,27.9007,32.6002,27.9809C32.616299999999995,28.045,32.616299999999995,28.1252,32.616299999999995,28.1894L32.616299999999995,32.0709Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/public/images/application/okr.svg b/public/images/application/okr.svg
deleted file mode 100644
index dcabcf544..000000000
--- a/public/images/application/okr.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="52" height="52" viewBox="0 0 52 52"><defs><clipPath id="master_svg0_3138_29732"><rect x="12" y="12" width="28" height="28" rx="0"/></clipPath></defs><g><rect x="0" y="0" width="52" height="52" rx="12" fill="#84C56A" fill-opacity="1"/><g clip-path="url(#master_svg0_3138_29732)"><g><g><path d="M27.126664663848878,28.231620556030272C26.25417466384888,29.10411055603027,24.854894663848878,29.10411055603027,23.98241466384888,28.231620556030272C23.126384663848878,27.359130556030273,23.126384663848878,25.959850556030275,23.98241466384888,25.087360556030273L29.085604663848876,19.984124556030274C28.032074663848878,19.424413556030274,26.813884663848874,19.078710556030273,25.513384663848875,19.078710556030273C21.39786466384888,19.078710556030273,18.039604663848877,22.420510556030273,18.039604663848877,26.55249055603027C18.039604663848877,30.684510556030276,21.39786466384888,34.009810556030274,25.513384663848875,34.009810556030274C29.62890466384888,34.009810556030274,32.98720466384888,30.668010556030275,32.98720466384888,26.536020556030273C32.98720466384888,25.301370556030275,32.69080466384888,24.149020556030273,32.16400466384888,23.128380556030272L27.126664663848878,28.231620556030272Z" fill="#FFFFFF" fill-opacity="1"/></g><g><g><path d="M36.49362605285644,15.83566C36.29602605285645,15.80274,36.147826052856445,15.65458,36.11492605285645,15.45703L35.489426052856444,12L32.21344605285645,15.27595L31.752506052856447,15.736889999999999L31.390346052856444,16.09905C31.291566052856446,16.19783,31.242186052856447,16.34599,31.258646052856445,16.51061L31.604346052856446,18.93053L31.768976052856445,19.09515L24.920750052856445,25.9434C24.558585452856445,26.305500000000002,24.558585452856445,26.8982,24.920750052856445,27.2603C25.282915052856445,27.622500000000002,25.875546052856446,27.622500000000002,26.237716052856445,27.2603L33.02008605285644,20.41211L33.135316052856446,20.41211L35.50582605285645,20.691969999999998C35.637526052856444,20.70843,35.78572605285645,20.65905,35.884526052856444,20.56027L40.00002605285644,16.44476L36.49362605285644,15.83566Z" fill="#FFFFFF" fill-opacity="1"/></g></g><g><path d="M37.876400000000004,21.926598541641233L37.827,21.778438541641236L34.9955,22.832008541641237L35.0449,22.980168541641234C35.5882,24.395898541641238,35.7857,25.877498541641238,35.6869,27.375498541641235C35.5882,28.807698541641237,35.1766,30.190598541641236,34.5017,31.458098541641235C33.8267,32.725698541641236,32.9048,33.845098541641235,31.769,34.73409854164123C30.5837,35.65599854164124,29.2667,36.31439854164124,27.7851,36.66009854164123C26.32,37.005798541641234,24.822,37.07169854164124,23.3568,36.77539854164124C21.941110000000002,36.51199854164123,20.62415,35.952298541641234,19.43888,35.11269854164124C18.23715,34.28959854164124,17.26588,33.25249854164123,16.50863,32.017798541641234C15.71845,30.733798541641235,15.22459,29.350998541641236,15.05997,27.836498541641234C14.87889,26.338398541641233,15.02704,24.840398541641235,15.48798,23.424598541641235C15.932459999999999,22.058288541641236,16.62386,20.823638541641238,17.61159,19.720678541641234C18.56639,18.650638541641236,19.71873,17.794618541641235,21.01923,17.185518541641237C22.3856,16.559958541641237,23.8342,16.247178541641237,25.3488,16.247178541641237C26.287100000000002,16.247178541641237,27.209,16.378878541641235,28.1473,16.609348541641236L28.2955,16.658728541641235L29.0856,13.744946541641236L28.9375,13.695560541641235C27.7851,13.382781541641235,26.567,13.218160641641235,25.3488,13.201698541641235C23.3898,13.201698541641235,21.5131,13.629712541641235,19.76812,14.436348541641236C18.10545,15.226538541641236,16.6074,16.345958541641235,15.37275,17.728768541641237C14.12163,19.128038541641235,13.21622,20.741328541641234,12.640045,22.502768541641235C12.0474104,24.330098541641235,11.866328,26.256098541641236,12.0967967,28.198598541641235C12.327266,30.124698541641234,12.969286,31.951998541641235,13.97347,33.59819854164124C14.94473,35.178598541641236,16.22878,36.52839854164124,17.75975,37.581998541641234C19.29072,38.63559854164124,21.002769999999998,39.359898541641236,22.8301,39.72209854164123C23.669600000000003,39.88669854164124,24.5257,39.968998541641234,25.3652,39.968998541641234C26.418799999999997,39.968998541641234,27.5053,39.83729854164123,28.5424,39.590398541641235C30.4355,39.11299854164123,32.180499999999995,38.273398541641235,33.695,37.08819854164123C35.1601,35.93579854164123,36.329,34.52009854164123,37.2179,32.87389854164124C38.0904,31.227698541641235,38.6007,29.449798541641236,38.7324,27.589498541641234C38.8477,25.663498541641236,38.5513,23.753898541641234,37.876400000000004,21.926598541641233Z" fill="#FFFFFF" fill-opacity="1"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/resources/assets/js/components/MicroApps/index.vue b/resources/assets/js/components/MicroApps/index.vue
index 8eebdffc9..9e70af570 100644
--- a/resources/assets/js/components/MicroApps/index.vue
+++ b/resources/assets/js/components/MicroApps/index.vue
@@ -423,6 +423,9 @@ export default {
             return new Promise(resolve => {
                 microApp.forceSetData(name, {type: 'beforeClose'}, array => {
                     if (!array?.find(item => item === true)) {
+                        if (name === 'appstore') {
+                            this.$store.dispatch("updateMicroAppsEntries");
+                        }
                         if ($A.isSubElectron) {
                             $A.Electron.sendMessage('windowDestroy');
                         } else {
diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue
index 5a66b676f..d9f38501d 100644
--- a/resources/assets/js/pages/manage/application.vue
+++ b/resources/assets/js/pages/manage/application.vue
@@ -15,6 +15,21 @@
                         {{ t == 'base' ? $L('常用') : $L('管理员') }}
                     </div>
                     <Row :gutter="16">
+                        <Col v-for="item in (t == 'base' ? filterMicroAppsEntries : filterMicroAppsEntriesAdmin)" :key="item.key"
+                            :xs="{ span: 6 }"
+                            :sm="{ span: 6 }"
+                            :lg="{ span: 6 }"
+                            :xl="{ span: 6 }"
+                            :xxl="{ span: 3 }">
+                            <div class="apply-col">
+                                <div @click="microClick(item)">
+                                    <div class="logo">
+                                        <div class="apply-icon no-dark-content" :style="{backgroundImage: `url(${item.icon})`}"></div>
+                                    </div>
+                                    <p>{{ $L(item.label) }}</p>
+                                </div>
+                            </div>
+                        </Col>
                         <Col v-for="(item, key) in applyList" :key="key"
                             v-if="((t=='base' && !item.type) || item.type == t) && item.show !== false"
                             :xs="{ span: 6 }"
@@ -280,7 +295,7 @@
 </template>
 
 <script>
-import {mapState} from "vuex";
+import { mapGetters, mapState } from "vuex";
 import DrawerOverlay from "../../components/DrawerOverlay";
 import UserSelect from "../../components/UserSelect";
 import SystemAibot from "./setting/components/SystemAibot";
@@ -349,6 +364,7 @@ export default {
     },
     activated() {
         this.initList()
+        this.$store.dispatch("updateMicroAppsEntries");
     },
     computed: {
         ...mapState([
@@ -362,6 +378,10 @@ export default {
             'formOptions',
             'routeLoading',
         ]),
+        ...mapGetters([
+            'filterMicroAppsEntries',
+            'filterMicroAppsEntriesAdmin',
+        ]),
         isExistAdminList() {
             return this.applyList.map(h => h.type).indexOf('admin') !== -1;
         }
@@ -375,7 +395,6 @@ export default {
         initList() {
             const applyList = [
                 { value: "approve", label: "审批中心", sort: 30 },
-                { value: "okr", label: "OKR 管理", sort: 40 },
                 { value: "report", label: "工作报告", sort: 50 },
                 { value: "mybot", label: "我的机器人", sort: 55 },
                 { value: "robot", label: "AI 机器人", sort: 60, show: this.systemConfig.server_closeai !== 'close' },
@@ -398,9 +417,7 @@ export default {
                 ])
             }
             // 管理员
-            const adminApplyList = [
-                { value: "okrAnalyze", label: "OKR 结果", sort: 150, show: this.userIsAdmin || this.userInfo.department_owner }
-            ];
+            const adminApplyList = [];
             if (this.userIsAdmin) {
                 adminApplyList.push(...[
                     { value: "ldap", label: "LDAP", sort: 160 },
@@ -432,6 +449,10 @@ export default {
             }
             return item.value == type && num > 0
         },
+        // 点击微应用
+        microClick(item) {
+            this.$store.dispatch("openMicroApp", item);
+        },
         // 点击应用
         applyClick(item, area = '') {
             switch (item.value) {
@@ -441,10 +462,6 @@ export default {
                 case 'setting':
                     this.goForward({ name: 'manage-' + item.value });
                     break;
-                case 'okr':
-                case 'okrAnalyze':
-                    this.$store.dispatch("openOkr", item.value == 'okr' ? 'list' : 'analysis');
-                    break;
                 case 'report':
                     emitter.emit('openReport', area == 'badge' ? 'receive' : 'my');
                     break;
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 3cd5d97ce..e43294f84 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -2619,11 +2619,19 @@ export default {
             });
         },
 
-        openOkr() {
-            if (!this.dialogData.link_id) {
+        openOkr(id) {
+            if (!id) {
                 return;
             }
-            this.$store.dispatch("openOkr", this.dialogData.link_id);
+            this.$store.dispatch("openMicroApp", {
+                name: 'okr-details',
+                url: $A.mainUrl('apps/okr/'),
+                props: {
+                    type: 'details',
+                    id,
+                },
+                transparent: true,
+            });
         },
 
         onSessionSubmit() {
@@ -3144,7 +3152,7 @@ export default {
                     break;
 
                 case 'okr':
-                    this.openOkr()
+                    this.openOkr(this.dialogData.link_id)
                     break;
 
                 default:
@@ -3752,7 +3760,7 @@ export default {
                         this.$store.dispatch("openTask", $A.runNum(target.getAttribute("data-id")));
                     }
                     if (target.classList.contains('mention') && target.classList.contains('okr')) {
-                        this.$store.dispatch("openOkr", $A.runNum(target.getAttribute("data-id")));
+                        this.openOkr($A.runNum(target.getAttribute("data-id")));
                     }
                     break;
 
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 0eff719f3..efb7f23ea 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -623,6 +623,7 @@ export default {
         dispatch("getProjectByQueue");
         dispatch("getTaskForDashboard");
         dispatch("dialogMsgRead");
+        dispatch("updateMicroAppsEntries");
         //
         const allIds = Object.values(state.userAvatar).map(({userid}) => userid);
         [...new Set(allIds)].some(userid => dispatch("getUserBasic", {userid}))
@@ -4635,33 +4636,44 @@ export default {
     },
 
     /** *****************************************************************************************/
-    /** *************************************** OKR *********************************************/
+    /** ************************************ App Store ******************************************/
     /** *****************************************************************************************/
 
     /**
-     * 打开OKR
+     * 更新微应用菜单入口
      * @param state
      * @param dispatch
-     * @param value
+     * @param appName
      */
-    openOkr({state}, value) {
-        if (/^\d+$/.test(value)) {
-            // 打开详情页
-            emitter.emit('openMicroApp', {
-                name: 'okr-details',
-                url: $A.mainUrl('apps/okr/'),
-                props: {
-                    type: 'details',
-                    id: value,
-                },
-                transparent: true,
-            });
-        } else {
-            // 打开列表、统计
-            emitter.emit('openMicroApp', {
-                name: `okr-${value}`,
-                url: $A.mainUrl(`apps/okr/${value}`),
-            });
+    updateMicroAppsEntries({state, dispatch}, appName) {
+        dispatch("call", {
+            url: 'apps/entry',
+            data: {
+                app_name: appName || null,
+            },
+        }).then(({data}) => {
+            state.microAppsEntries = data
+        })
+    },
+
+    /**
+     * 打开微应用
+     * @param state
+     * @param item
+     */
+    openMicroApp({state}, item) {
+        if (!item || !$A.isJson(item)) {
+            return
         }
+        const event = {
+            name: `${item.app_name}_${item.key}`,
+            url: $A.mainUrl(item.url),
+        }
+        for (let key in item) {
+            if (['props', 'transparent', 'keepAlive', 'disableScopecss'].includes(key)) {
+                event[key] = item[key]
+            }
+        }
+        emitter.emit('openMicroApp', event);
     },
 }
diff --git a/resources/assets/js/store/getters.js b/resources/assets/js/store/getters.js
index 7f05e9b98..05ebd4704 100644
--- a/resources/assets/js/store/getters.js
+++ b/resources/assets/js/store/getters.js
@@ -276,5 +276,38 @@ export default {
     getDialogQuote: (state) => (id) => {
         const quote = state.dialogQuotes.find(item => item.id === id)
         return quote || null
+    },
+
+    /**
+     * 获取应用菜单入口
+     * 过滤出location为application的菜单项
+     *
+     * @param {Object} state
+     * @returns {Array} 
+     */
+    filterMicroAppsEntries: (state) => {
+        return state.microAppsEntries.filter(item => item.location === 'application')
+    },
+
+    /**
+     * 获取应用管理菜单入口
+     * 过滤出location为application/admin的菜单项
+     *
+     * @param {Object} state
+     * @returns {Array} 
+     */
+    filterMicroAppsEntriesAdmin: (state) => {
+        return state.microAppsEntries.filter(item => item.location === 'application/admin')
+    },
+
+    /**
+     * 获取主导航菜单入口
+     * 过滤出location为main/menu的菜单项
+     *
+     * @param {Object} state
+     * @returns {Array} 
+     */
+    filterMicroAppsEntriesMain: (state) => {
+        return state.microAppsEntries.filter(item => item.location === 'main/menu')
     }
 }
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index 55dd03a3a..2f886c541 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -260,4 +260,7 @@ export default {
 
     // 长按数据
     longpressData: {type: '', data: null, element: null},
+
+    // 微应用菜单入口
+    microAppsEntries: [],
 };
diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss
index b1a26d1a7..8fb35ab77 100644
--- a/resources/assets/sass/pages/page-apply.scss
+++ b/resources/assets/sass/pages/page-apply.scss
@@ -199,14 +199,6 @@
         background-image: url("../images/application/meeting-join.svg");
     }
 
-    &.okr {
-        background-image: url("../images/application/okr.svg");
-    }
-
-    &.okr-analyze {
-        background-image: url("../images/application/okr-analyze.svg");
-    }
-
     &.report {
         background-image: url("../images/application/report.svg");
     }
diff --git a/resources/assets/statics/public/images/application/okr-analyze.svg b/resources/assets/statics/public/images/application/okr-analyze.svg
deleted file mode 100644
index 6270061a6..000000000
--- a/resources/assets/statics/public/images/application/okr-analyze.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="52" height="52" viewBox="0 0 52 52"><defs><clipPath id="master_svg0_3138_30094"><rect x="12" y="12" width="28" height="28" rx="0"/></clipPath></defs><g><rect x="0" y="0" width="52" height="52" rx="12" fill="#FFAA6B" fill-opacity="1"/><g clip-path="url(#master_svg0_3138_30094)"><g><path d="M35.4072,13L16.5768,13C14.60395,13,13,14.60395,13,16.5768L13,35.4232C13,37.379999999999995,14.60395,38.984,16.5768,38.984L35.4232,38.984C37.396100000000004,38.984,39,37.379999999999995,39,35.4072L39,16.5768C38.984,14.58791,37.396100000000004,13,35.4072,13ZM21.48489,32.1351C21.48489,32.1993,21.48489,32.2795,21.46885,32.343599999999995C21.45281,32.4078,21.43677,32.471900000000005,21.404690000000002,32.536100000000005C21.37261,32.6002,21.34053,32.6644,21.30845,32.7286C21.22825,32.8408,21.13202,32.9531,21.01974,33.0173C20.95558,33.0494,20.89142,33.0814,20.82727,33.1135C20.76311,33.1456,20.68291,33.1616,20.61875,33.1777C20.5546,33.1937,20.4744,33.1937,20.41024,33.1937C20.34608,33.1937,20.26588,33.1937,20.20173,33.1777C20.13757,33.1616,20.07341,33.1456,20.00925,33.1135C19.94509,33.0814,19.88094,33.0494,19.81678,33.0173C19.75262,32.9852,19.7045,32.9371,19.65638,32.888999999999996C19.60827,32.8408,19.56015,32.776700000000005,19.51203,32.7286C19.47995,32.6644,19.44787,32.6002,19.41579,32.536100000000005C19.38371,32.471900000000005,19.36767,32.4078,19.35163,32.327600000000004C19.33559,32.263400000000004,19.33559,32.1832,19.33559,32.1191L19.33559,23.8908C19.33559,23.8106,19.33559,23.746499999999997,19.35163,23.682299999999998C19.36767,23.6181,19.38371,23.554000000000002,19.41579,23.489800000000002C19.44787,23.4257,19.47995,23.3615,19.51203,23.2973C19.59223,23.1851,19.68846,23.0728,19.80074,23.0086C19.8649,22.97656,19.92905,22.928440000000002,19.99321,22.912399999999998C20.05737,22.880319999999998,20.12153,22.86428,20.20173,22.84824C20.26588,22.8322,20.34608,22.81616,20.41024,22.8322C20.4744,22.8322,20.5546,22.8322,20.61875,22.84824C20.68291,22.86428,20.74707,22.880319999999998,20.811230000000002,22.912399999999998C20.87538,22.94448,20.93954,22.97656,21.003700000000002,23.0086C21.11598,23.0888,21.22825,23.1851,21.29241,23.2973C21.32449,23.3615,21.37261,23.4257,21.38865,23.489800000000002C21.42073,23.554000000000002,21.43677,23.6181,21.45281,23.6983C21.46884,23.7625,21.46884,23.8427,21.46884,23.9068Q21.48489,23.9068,21.48489,32.1351ZM27.0987,32.0709C27.0987,32.1351,27.0987,32.2153,27.082700000000003,32.2795C27.0666,32.343599999999995,27.0506,32.4078,27.0185,32.471900000000005C26.9864,32.536100000000005,26.9543,32.6002,26.9223,32.6644C26.8902,32.7286,26.842100000000002,32.776700000000005,26.794,32.824799999999996C26.7458,32.8729,26.6817,32.921,26.6336,32.9692C26.5694,33.0012,26.505200000000002,33.0333,26.4411,33.0654C26.3769,33.0975,26.3128,33.1135,26.232599999999998,33.1295C26.1684,33.1456,26.0882,33.1456,26.0241,33.1456C25.959899999999998,33.1456,25.8797,33.1456,25.8155,33.1295C25.7514,33.1135,25.6872,33.0975,25.6231,33.0654C25.5589,33.0333,25.494799999999998,33.0012,25.4306,32.9692C25.3183,32.888999999999996,25.206,32.792699999999996,25.1419,32.6804C25.1098,32.616299999999995,25.061700000000002,32.552099999999996,25.0456,32.488C25.0136,32.4238,24.997500000000002,32.3596,24.9815,32.2795C24.9655,32.2153,24.9655,32.1351,24.9655,32.0709L24.9655,19.88094C24.9655,19.81678,24.9655,19.73658,24.9815,19.67242C24.997500000000002,19.60827,25.0136,19.52807,25.0456,19.47995C25.0777,19.41579,25.1098,19.35163,25.1419,19.287480000000002C25.222099999999998,19.1752,25.3183,19.06292,25.4306,18.99877C25.494799999999998,18.96669,25.5589,18.91857,25.6231,18.90253C25.6872,18.870449999999998,25.7514,18.85441,25.8316,18.83837C25.9759,18.80629,26.1203,18.80629,26.2486,18.83837C26.3128,18.85441,26.3769,18.870449999999998,26.4411,18.90253C26.505200000000002,18.93461,26.5694,18.96669,26.6336,18.99877C26.7458,19.078960000000002,26.8581,19.1752,26.9223,19.287480000000002C26.9543,19.35163,26.9864,19.41579,27.0185,19.47995C27.0506,19.54411,27.0666,19.62431,27.082700000000003,19.68846C27.0987,19.75262,27.0987,19.832819999999998,27.0987,19.89698L27.0987,32.0709ZM32.616299999999995,32.0709C32.616299999999995,32.1351,32.616299999999995,32.2153,32.6002,32.2795C32.584199999999996,32.343599999999995,32.568200000000004,32.4078,32.536100000000005,32.471900000000005C32.504000000000005,32.536100000000005,32.471900000000005,32.6002,32.4399,32.6644C32.359700000000004,32.776700000000005,32.263400000000004,32.888999999999996,32.1511,32.9531C32.087,32.9852,32.022800000000004,33.0333,31.9587,33.0494C31.8945,33.0814,31.8304,33.0975,31.7502,33.1135C31.686,33.1295,31.6058,33.1295,31.5416,33.1295C31.4775,33.1295,31.3973,33.1295,31.3331,33.1135C31.269,33.0975,31.2048,33.0814,31.1407,33.0494C31.0765,33.0173,31.0123,32.9852,30.9482,32.9531C30.8359,32.8729,30.7236,32.776700000000005,30.6595,32.6644C30.6274,32.6002,30.5793,32.536100000000005,30.5632,32.471900000000005C30.5312,32.4078,30.5151,32.343599999999995,30.4991,32.263400000000004C30.483,32.1993,30.483,32.1191,30.483,32.0549L30.483,28.173299999999998C30.483,28.1092,30.483,28.029,30.4991,27.9648C30.5151,27.9007,30.5312,27.8365,30.5632,27.772399999999998C30.5953,27.708199999999998,30.6274,27.644,30.6595,27.579900000000002C30.7397,27.467599999999997,30.8359,27.3553,30.9482,27.2912C31.0123,27.2591,31.0765,27.211,31.1407,27.1949C31.2048,27.1629,31.269,27.1468,31.3492,27.1308C31.4133,27.1147,31.4935,27.1147,31.5577,27.1147C31.6218,27.1147,31.702,27.1147,31.7662,27.1308C31.8304,27.1468,31.8945,27.1629,31.9587,27.1949C32.022800000000004,27.227,32.087,27.2591,32.1511,27.2912C32.263400000000004,27.3714,32.375699999999995,27.467599999999997,32.4399,27.579900000000002C32.471900000000005,27.644,32.519999999999996,27.708199999999998,32.536100000000005,27.772399999999998C32.568200000000004,27.8365,32.584199999999996,27.9007,32.6002,27.9809C32.616299999999995,28.045,32.616299999999995,28.1252,32.616299999999995,28.1894L32.616299999999995,32.0709Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/resources/assets/statics/public/images/application/okr.svg b/resources/assets/statics/public/images/application/okr.svg
deleted file mode 100644
index dcabcf544..000000000
--- a/resources/assets/statics/public/images/application/okr.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="52" height="52" viewBox="0 0 52 52"><defs><clipPath id="master_svg0_3138_29732"><rect x="12" y="12" width="28" height="28" rx="0"/></clipPath></defs><g><rect x="0" y="0" width="52" height="52" rx="12" fill="#84C56A" fill-opacity="1"/><g clip-path="url(#master_svg0_3138_29732)"><g><g><path d="M27.126664663848878,28.231620556030272C26.25417466384888,29.10411055603027,24.854894663848878,29.10411055603027,23.98241466384888,28.231620556030272C23.126384663848878,27.359130556030273,23.126384663848878,25.959850556030275,23.98241466384888,25.087360556030273L29.085604663848876,19.984124556030274C28.032074663848878,19.424413556030274,26.813884663848874,19.078710556030273,25.513384663848875,19.078710556030273C21.39786466384888,19.078710556030273,18.039604663848877,22.420510556030273,18.039604663848877,26.55249055603027C18.039604663848877,30.684510556030276,21.39786466384888,34.009810556030274,25.513384663848875,34.009810556030274C29.62890466384888,34.009810556030274,32.98720466384888,30.668010556030275,32.98720466384888,26.536020556030273C32.98720466384888,25.301370556030275,32.69080466384888,24.149020556030273,32.16400466384888,23.128380556030272L27.126664663848878,28.231620556030272Z" fill="#FFFFFF" fill-opacity="1"/></g><g><g><path d="M36.49362605285644,15.83566C36.29602605285645,15.80274,36.147826052856445,15.65458,36.11492605285645,15.45703L35.489426052856444,12L32.21344605285645,15.27595L31.752506052856447,15.736889999999999L31.390346052856444,16.09905C31.291566052856446,16.19783,31.242186052856447,16.34599,31.258646052856445,16.51061L31.604346052856446,18.93053L31.768976052856445,19.09515L24.920750052856445,25.9434C24.558585452856445,26.305500000000002,24.558585452856445,26.8982,24.920750052856445,27.2603C25.282915052856445,27.622500000000002,25.875546052856446,27.622500000000002,26.237716052856445,27.2603L33.02008605285644,20.41211L33.135316052856446,20.41211L35.50582605285645,20.691969999999998C35.637526052856444,20.70843,35.78572605285645,20.65905,35.884526052856444,20.56027L40.00002605285644,16.44476L36.49362605285644,15.83566Z" fill="#FFFFFF" fill-opacity="1"/></g></g><g><path d="M37.876400000000004,21.926598541641233L37.827,21.778438541641236L34.9955,22.832008541641237L35.0449,22.980168541641234C35.5882,24.395898541641238,35.7857,25.877498541641238,35.6869,27.375498541641235C35.5882,28.807698541641237,35.1766,30.190598541641236,34.5017,31.458098541641235C33.8267,32.725698541641236,32.9048,33.845098541641235,31.769,34.73409854164123C30.5837,35.65599854164124,29.2667,36.31439854164124,27.7851,36.66009854164123C26.32,37.005798541641234,24.822,37.07169854164124,23.3568,36.77539854164124C21.941110000000002,36.51199854164123,20.62415,35.952298541641234,19.43888,35.11269854164124C18.23715,34.28959854164124,17.26588,33.25249854164123,16.50863,32.017798541641234C15.71845,30.733798541641235,15.22459,29.350998541641236,15.05997,27.836498541641234C14.87889,26.338398541641233,15.02704,24.840398541641235,15.48798,23.424598541641235C15.932459999999999,22.058288541641236,16.62386,20.823638541641238,17.61159,19.720678541641234C18.56639,18.650638541641236,19.71873,17.794618541641235,21.01923,17.185518541641237C22.3856,16.559958541641237,23.8342,16.247178541641237,25.3488,16.247178541641237C26.287100000000002,16.247178541641237,27.209,16.378878541641235,28.1473,16.609348541641236L28.2955,16.658728541641235L29.0856,13.744946541641236L28.9375,13.695560541641235C27.7851,13.382781541641235,26.567,13.218160641641235,25.3488,13.201698541641235C23.3898,13.201698541641235,21.5131,13.629712541641235,19.76812,14.436348541641236C18.10545,15.226538541641236,16.6074,16.345958541641235,15.37275,17.728768541641237C14.12163,19.128038541641235,13.21622,20.741328541641234,12.640045,22.502768541641235C12.0474104,24.330098541641235,11.866328,26.256098541641236,12.0967967,28.198598541641235C12.327266,30.124698541641234,12.969286,31.951998541641235,13.97347,33.59819854164124C14.94473,35.178598541641236,16.22878,36.52839854164124,17.75975,37.581998541641234C19.29072,38.63559854164124,21.002769999999998,39.359898541641236,22.8301,39.72209854164123C23.669600000000003,39.88669854164124,24.5257,39.968998541641234,25.3652,39.968998541641234C26.418799999999997,39.968998541641234,27.5053,39.83729854164123,28.5424,39.590398541641235C30.4355,39.11299854164123,32.180499999999995,38.273398541641235,33.695,37.08819854164123C35.1601,35.93579854164123,36.329,34.52009854164123,37.2179,32.87389854164124C38.0904,31.227698541641235,38.6007,29.449798541641236,38.7324,27.589498541641234C38.8477,25.663498541641236,38.5513,23.753898541641234,37.876400000000004,21.926598541641233Z" fill="#FFFFFF" fill-opacity="1"/></g></g></g></g></svg>
\ No newline at end of file