diff --git a/src/api/mdp/sys/menuFavorite.js b/src/api/mdp/sys/menuFavorite.js index 945a2ba5..31bad7ea 100644 --- a/src/api/mdp/sys/menuFavorite.js +++ b/src/api/mdp/sys/menuFavorite.js @@ -4,5 +4,4 @@ import config from '@/common/config' let base = config.getSysBasePath(); export const userMenuFavoriteList = params => { return axios.get(`${base}/menu/menuFavorite/list`, { params: params }); }; - export const saveMenuFavoriteList = params => { return axios.post(`${base}/menu/menuFavorite/batchSaveMenuFavorites`, params); }; diff --git a/src/api/mdp/sys/modules.js b/src/api/mdp/sys/modules.js new file mode 100644 index 00000000..bb0a6ee8 --- /dev/null +++ b/src/api/mdp/sys/modules.js @@ -0,0 +1,7 @@ +import axios from '@/utils/request' +import config from '@/common/config' + +let base = config.getSysBasePath(); + +export const getAllMenuModule = params => { return axios.get(`${base}/sys/sys/mdp/menu/menuModule/list`, {params: params }); }; +export const getBuyMenuModule = params => { return axios.get(`${base}/sys/sys/mdp/menu/menuModuleBranch/list`, {params: params }); }; diff --git a/src/assets/image/module/mall/mall_online retailers.png b/src/assets/image/module/mall/mall_online_retailers.png similarity index 100% rename from src/assets/image/module/mall/mall_online retailers.png rename to src/assets/image/module/mall/mall_online_retailers.png diff --git a/src/assets/image/module/oa/oa_Office Supplies.png b/src/assets/image/module/oa/oa_Office_supplies.png similarity index 100% rename from src/assets/image/module/oa/oa_Office Supplies.png rename to src/assets/image/module/oa/oa_Office_supplies.png diff --git a/src/assets/image/module/oa/oa_clock in.png b/src/assets/image/module/oa/oa_clock_in.png similarity index 100% rename from src/assets/image/module/oa/oa_clock in.png rename to src/assets/image/module/oa/oa_clock_in.png diff --git a/src/assets/image/module/oa/oa_org.png b/src/assets/image/module/oa/oa_org.png new file mode 100644 index 00000000..e17fa7f0 Binary files /dev/null and b/src/assets/image/module/oa/oa_org.png differ diff --git a/src/assets/image/module/oa/oa_Seal Center.png b/src/assets/image/module/oa/oa_seal_center.png similarity index 100% rename from src/assets/image/module/oa/oa_Seal Center.png rename to src/assets/image/module/oa/oa_seal_center.png diff --git a/src/assets/image/module/xm/xm_Efficiency management.png b/src/assets/image/module/xm/xm_Efficiency_management.png similarity index 100% rename from src/assets/image/module/xm/xm_Efficiency management.png rename to src/assets/image/module/xm/xm_Efficiency_management.png diff --git a/src/assets/image/module/xm/xm_flow line.png b/src/assets/image/module/xm/xm_flow_line.png similarity index 100% rename from src/assets/image/module/xm/xm_flow line.png rename to src/assets/image/module/xm/xm_flow_line.png diff --git a/src/assets/image/module/xm/xm_product management.png b/src/assets/image/module/xm/xm_product_management.png similarity index 100% rename from src/assets/image/module/xm/xm_product management.png rename to src/assets/image/module/xm/xm_product_management.png diff --git a/src/assets/image/module/xm/xm_project management.png b/src/assets/image/module/xm/xm_project_management.png similarity index 100% rename from src/assets/image/module/xm/xm_project management.png rename to src/assets/image/module/xm/xm_project_management.png diff --git a/src/components/ModulesMenu/allMenus.vue b/src/components/ModulesMenu/allMenus.vue new file mode 100644 index 00000000..9a11328a --- /dev/null +++ b/src/components/ModulesMenu/allMenus.vue @@ -0,0 +1,179 @@ + + + + + + + \ No newline at end of file diff --git a/src/components/ModulesMenu/index.scss b/src/components/ModulesMenu/index.scss new file mode 100644 index 00000000..be0b8c4a --- /dev/null +++ b/src/components/ModulesMenu/index.scss @@ -0,0 +1,94 @@ +.moduleset { + .dialog-title { + font-size: 22px; + font-weight: bold; + color: #7D7D7D; + height: 68px; + p { + line-height: 68px; + margin-left: 28px; + } + } + .toolBox { + display: flex; + flex-direction: column; + padding: 0 40px; + + /deep/ .el-input--small .el-input__inner { + height: 40px; + } + + .selectItem { + display: flex; + flex-direction: row; + height: 70px; + .active { + color: #409EFF; + } + .item { + display: flex; + flex-direction: row; + margin-right: 120px; + cursor: pointer; + margin: 25px 50px 0 20px; + img { + width: 45px; + height: 45px; + } + span { + margin-left: 8px; + font-size: 16px; + } + } + } + } + + .nav { + height: 400px; + overflow: auto; + display:flex; + flex-wrap:wrap; + padding: 0 20px; + margin-left: 20px; + padding-bottom: 40px; + .nav_item { + display: flex; + height: 210px; + flex-direction: column; + // width: calc((100% / 5) - 10px); + width: 170px; + border: 2px solid #EDF0F9; + box-shadow: 0px 3px 4px 0px rgba(186, 184, 184, 0.1); + border-radius: 8px; + align-items: center; + position: relative; + cursor: pointer; + margin-top: 10px; + margin-right: 10px; + img { + width: 94px; + height: 94px; + margin: 18px 18px 10px 18px; + } + + span { + font-size: 16px; + color: #7D7D7D; + line-height: 26px; + margin-bottom: 4px; + } + + .buyAfter { + color: #409EFF; + } + + .desc{ + margin-top: 12px; + } + } + .itemActive { + border: 2px solid #90B1F4; + box-shadow: 0px 3px 4px 0px rgba(186, 184, 184, 0.1); + } + } +} \ No newline at end of file diff --git a/src/components/ModulesMenu/modulesOfIcon.js b/src/components/ModulesMenu/modulesOfIcon.js new file mode 100644 index 00000000..82844eb9 --- /dev/null +++ b/src/components/ModulesMenu/modulesOfIcon.js @@ -0,0 +1,128 @@ +import mall from '@/assets/image/module/mall/mall_online_retailers.png' +import mallMarketing from '@/assets/image/module/mall/mall_marketing.png' +import mdpArc from '@/assets/image/module/oa/oa_content.png' +import mdpSys from '@/assets/image/module/oa/oa_org.png' +import oaAsset from '@/assets/image/module/oa/oa_assets.png' +import oaAttendance from '@/assets/image/module/oa/oa_clock_in.png' +import oaCar from '@/assets/image/module/oa/oa_car.png' +import oaContract from '@/assets/image/module/oa/oa_contract.png' +import oaCustomer from '@/assets/image/module/oa/oa_customer.png' +import oaFile from '@/assets/image/module/oa/oa_archives.png' +import oaFinance from '@/assets/image/module/oa/oa_finance.png' +import oaMeeting from '@/assets/image/module/oa/oa_meeting.png' +import oaOffice from '@/assets/image/module/oa/oa_Office_supplies.png' +import oaPerformance from '@/assets/image/module/oa/oa_KPI.png' +import oaSchedule from '@/assets/image/module/oa/oa_schedule.png' +import oaSeal from '@/assets/image/module/oa/oa_seal_center.png' +import oaSupervision from '@/assets/image/module/oa/oa_supervise.png' +import xmAnalysis from '@/assets/image/module/xm/xm_Efficiency_management.png' +import xmDevelopment from '@/assets/image/module/xm/xm_development.png' +import xmPipeline from '@/assets/image/module/xm/xm_flow_line.png' +import xmProduct from '@/assets/image/module/xm/xm_product_management.png' +import xmProject from '@/assets/image/module/xm/xm_project_management.png' +import xmTest from '@/assets/image/module/xm/xm_test.png' +import xmCrowd from '@/assets/image/module/xm/xm_crowd-sourcing.png' + + +export const modulesOfIcon = [ + { + id: 'mall', + logoUrl: mall + }, + { + id: 'mall-marketing', + logoUrl: mallMarketing + }, + { + id: 'mdp-arc', + logoUrl: mdpArc + }, + { + id: 'mdp-sys', + logoUrl: mdpSys + }, + { + id: 'oa-asset', + logoUrl: oaAsset + }, + { + id: 'oa-attendance', + logoUrl: oaAttendance + }, + { + id: 'oa-car', + logoUrl: oaCar, + }, + { + id: 'oa-contract', + logoUrl: oaContract + }, + { + id: 'oa-customer', + logoUrl: oaCustomer + }, + { + id: 'oa-file', + logoUrl: oaFile + }, + { + id: 'oa-finance', + logoUrl: oaFinance + }, + { + id: 'oa-meeting', + logoUrl: oaMeeting + }, + { + id: 'oa-office', + logoUrl: oaOffice + }, + { + id: 'oa-performance', + logoUrl: oaPerformance + }, + { + id: 'oa-schedule', + logoUrl: oaSchedule + }, + { + id: 'oa-seal', + logoUrl: oaSeal, + }, + { + id: 'oa-supervision', + logoUrl: oaSupervision + }, + { + id: 'xm-analysis', + logoUrl: xmAnalysis, + }, + { + id: 'xm-development', + logoUrl: xmDevelopment + }, + { + id: 'xm-pipeline', + logoUrl: xmPipeline + }, + { + id: 'xm-product', + logoUrl: xmProduct + }, + { + id: 'xm-project', + logoUrl: xmProject + }, + { + id: 'xm-test', + logoUrl: xmTest + }, + { + id: 'xm-workload', + logoUrl: '', + }, + { + id: 'xm-crowd', + logoUrl: xmCrowd, + } +] \ No newline at end of file diff --git a/src/components/TopModules/index.vue b/src/components/TopModules/index.vue index 31e86fba..6f01005c 100644 --- a/src/components/TopModules/index.vue +++ b/src/components/TopModules/index.vue @@ -9,7 +9,7 @@ -->
-
+
全部应用
@@ -21,18 +21,13 @@
- +
- + --> + + @@ -61,8 +58,10 @@ import NProgress from 'nprogress' // progress bar const topModulesData = require("./top_modules_"+process.env.CONTEXT+".js") const allModulesData = require("./all_modules.js") - +import allMenus from '../ModulesMenu/allMenus' + export default { + components: {allMenus}, created() { }, data() { @@ -74,6 +73,7 @@ export default { topModules: topModulesData.default, //模块分类 categorys:allModulesData.default, + menuVisible: false, } }, watch: { diff --git a/src/views/myWork/set/index.vue b/src/views/myWork/set/index.vue index 8be2738f..98df6e58 100644 --- a/src/views/myWork/set/index.vue +++ b/src/views/myWork/set/index.vue @@ -125,7 +125,7 @@ import { editUser,changePassword } from '@/api/mdp/sys/user'; import { mapGetters } from 'vuex' import SingleShearUpload from "@/components/Image/Single/Index"; - + import md5 from "js-md5"; export default { computed: { diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 4e1398bc..23a94a92 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -174,19 +174,17 @@