Skip to content

S
so-manage-ui
Commit 2479f9a2 authored by 何小勇's avatar 何小勇
Browse files
Options

merge

parents 93515534 a1522104
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3500 additions and 210 deletions
.beagle.yml
View file @ 2479f9a2
......@@ -62,7 +62,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5 # 基础镜像,根据项目需求进行使用，如果第三方登录改成ui-base
dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui # 生成镜像的 分组/名称
version: "5.3.0" # 版本号
version: "5.0.7" # 版本号
channel: alpha # 后缀 example: alpha test fix-alpha fix等
args: "TARGETOS=linux,TARGETARCH=amd64" # 不同架构的构建参数
registry: registry.cn-qingdao.aliyuncs.com # 私有仓库地址
......@@ -77,7 +77,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
namespace: apaas-v5
deployment: apaas-manage-ui
container: apaas-manage-ui
image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.3.0-alpha
image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.7-alpha
environment:
KUBERNETES_SERVER:
from_secret: KUBERNETES_SERVER
......@@ -93,7 +93,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-arm64
dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui
version: "5.3.0"
version: "5.0.7"
channel: alpha-arm64
args: "TARGETOS=linux,TARGETARCH=arm64"
registry: registry.cn-qingdao.aliyuncs.com
......
src/assets/css/index.css
View file @ 2479f9a2
......@@ -9,7 +9,7 @@
}
/* 返回按钮颜色 */
.from_return>.el-button--primary {
.from_return > .el-button--primary {
background-color: #edf0ff !important;
border-color: #edf0ff !important;
color: #264dd9 !important;
......@@ -71,12 +71,15 @@
cursor: pointer;
}
.space_bet {}
.space_bet {
}
/* reset */
html {}
html {
}
html,body {
html,
body {
margin: 0;
font-family: Microsoft YaHei, sans-serif;
/* font-size: 17px; */
......@@ -101,16 +104,16 @@ h5 {
font-weight: normal;
}
h1{
h1 {
font-size: 32px;
}
h2{
h2 {
font-size: 24px;
}
h3{
h3 {
font-size: 18.7px;
}
h4{
h4 {
font-size: 16px;
}
......@@ -154,7 +157,7 @@ div {
align-items: flex-start;
}
.ss_card>.sc_left_container {
.ss_card > .sc_left_container {
width: 6rem;
height: 6rem;
flex-shrink: 0;
......@@ -163,19 +166,19 @@ div {
font-size: 0;
}
.ss_card>.sc_right_container {
.ss_card > .sc_right_container {
width: calc(100% - 7rem);
flex-grow: 1;
margin-left: 1.2rem;
}
.ss_card>.sc_right_container>.sc_title {
.ss_card > .sc_right_container > .sc_title {
font-size: 1.6rem;
font-weight: bold;
line-height: 2.6rem;
}
.ss_card>.sc_right_container>.sc_info {
.ss_card > .sc_right_container > .sc_info {
display: flex;
justify-content: space-between;
}
......@@ -202,13 +205,13 @@ div {
position: relative;
}
.from_return>.el-button--primary {
.from_return > .el-button--primary {
position: absolute;
top: 15px;
left: 20px;
}
.from_return>span {
.from_return > span {
color: #1a2236;
font-size: 16px;
}
......@@ -621,7 +624,7 @@ border-radius:8px;
background-color: #fff;
}
.el-radio__input.is-checked+.el-radio__label {
.el-radio__input.is-checked + .el-radio__label {
color: #1a2236;
font-weight: 700;
}
......@@ -674,18 +677,18 @@ border-radius:8px;
}
/* common */
.apass_breadcrumb>.el-breadcrumb {
.apass_breadcrumb > .el-breadcrumb {
padding: 10px 0;
}
.apass_breadcrumb>.el-breadcrumb .el-breadcrumb__inner {
.apass_breadcrumb > .el-breadcrumb .el-breadcrumb__inner {
font-size: 14px;
font-weight: 400;
color: #898d9e;
line-height: 23px;
}
.apass_breadcrumb>.el-breadcrumb .el-breadcrumb__item:last-child .el-breadcrumb__inner {
.apass_breadcrumb > .el-breadcrumb .el-breadcrumb__item:last-child .el-breadcrumb__inner {
color: #242c43;
font-weight: normal;
}
......@@ -758,8 +761,7 @@ border-radius:8px;
border-color: #ebeef5;
}
.apass_table .el-table th>.cell {
.apass_table .el-table th > .cell {
color: #1a2236;
}
......@@ -838,7 +840,7 @@ border-radius:8px;
border-color: #515fe7;
}
.apass_checkbox .el-checkbox__input.is-checked+.el-checkbox__label {
.apass_checkbox .el-checkbox__input.is-checked + .el-checkbox__label {
color: #58617a;
}
......@@ -921,7 +923,7 @@ border-radius:8px;
margin-top: 50px;
}
.apaas_detail_container .detail_action .el-button+.el-button {
.apaas_detail_container .detail_action .el-button + .el-button {
margin-left: 30px;
}
......@@ -992,7 +994,7 @@ border-radius:8px;
width: 124px;
}
.apaas_steps .apaas_step .apaas_step_action .el-button+.el-button {
.apaas_steps .apaas_step .apaas_step_action .el-button + .el-button {
margin-left: 20px;
}
......@@ -1004,7 +1006,7 @@ border-radius:8px;
flex-grow: 1;
font-size: 0;
}
.filter_list>.filter_item {
.filter_list > .filter_item {
display: flex;
align-items: center;
margin: 0 34px 16px 0;
......@@ -1015,7 +1017,7 @@ border-radius:8px;
vertical-align: middle;
} */
.filter_list>.filter_item>.filter_title {
.filter_list > .filter_item > .filter_title {
text-align: right;
font-size: 14px;
color: #242c43;
......@@ -1045,14 +1047,14 @@ border-radius:8px;
text-align: right;
}
.filter_action>.el-button {
.filter_action > .el-button {
/* min-width: 90px; */
height: 36px;
margin-top: 16px;
padding: 12px 17px;
}
.filter_action>.el-button+.el-button {
.filter_action > .el-button + .el-button {
margin-left: 10px;
}
......@@ -1091,7 +1093,7 @@ border-radius:8px;
margin-top: 5px;
}
.meassage_detail_dialog .detail_item .full_content>.apaas_scroll {
.meassage_detail_dialog .detail_item .full_content > .apaas_scroll {
height: 176px;
overflow: auto;
}
......@@ -1266,11 +1268,11 @@ border-radius:8px;
.el-date-table td.in-range div:hover,
.el-date-table.is-week-mode .el-date-table__row.current div,
.el-date-table.is-week-mode .el-date-table__row:hover div {
background-color: #eff2fa!important;
background-color: #eff2fa !important;
}
.el-date-table td.end-date .el-date-table-cell__text,
.el-date-table td.end-date .el-date-table-cell__text,
.el-date-table td.start-date .el-date-table-cell__text {
background-color: #3759be!important;
background-color: #3759be !important;
}
.el-date-table td.end-date span,
.el-date-table td.start-date span {
......@@ -1450,8 +1452,6 @@ border-radius:8px;
padding-right: 10px;
}
.page_container {
width: 100%;
padding: 0 24px;
......@@ -1463,11 +1463,10 @@ border-radius:8px;
align-items: stretch;
}
.page_content {
background-color: #fff;
height: calc(100% - 46px - 20px);
box-shadow: 0px 1px 4px 0px
rgba(0, 7, 101, 0.15);
border-radius: 6px;
background-color: #fff;
height: calc(100% - 46px - 20px);
box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
border-radius: 6px;
}
.flex_row {
......@@ -1483,19 +1482,16 @@ border-radius:8px;
overflow: hidden;
}
.flex_right {
height: calc(100% - 16px);
flex: 1;
overflow: hidden;
}
.bgc_white {
box-shadow: 0px 1px 4px 0px
rgba(0, 7, 101, 0.15);
border-radius: 6px;
box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
border-radius: 6px;
background-color: #fff;
}
.tree::-webkit-scrollbar {
......@@ -1519,7 +1515,7 @@ border-radius:8px;
}
.header_info {
font-size: 14px;
color: #404a62;
color: #404a62;
padding-left: 20px;
}
.fr {
......@@ -1533,8 +1529,8 @@ border-radius:8px;
color: #404a62;
}
.icon_eye {
font-size: 12px;
color: #a9b1c7;
font-size: 12px;
color: #a9b1c7;
margin-right: 8px;
vertical-align: baseline;
cursor: pointer;
......@@ -1554,7 +1550,7 @@ border-radius:8px;
.warning_info {
background-color: #f7f7f9;
font-size: 14px;
color: #404a62;
color: #404a62;
padding: 5px;
text-align: left;
margin: 20px 0;
......@@ -1563,6 +1559,7 @@ border-radius:8px;
color: #d75138;
}
<<<<<<< HEAD
.register_btn {
background-color: #eff2fa;
border-radius: 4px;
......@@ -1581,3 +1578,15 @@ border-radius:8px;
padding: 20px;
}
=======
.tip-image {
position: absolute;
right: -24px;
bottom: 9px;
width: 16px;
height: 16px;
margin-left: 8px;
background-image: url("../imgs/ic_tips.png");
background-size: contain;
}
>>>>>>> a152210490b057d5d9be08d415be67274b954aaf
src/bg-ui/bg-form-gap.vue 0 → 100644
View file @ 2479f9a2
<template>
<div class="gap-title">
<span>{{ title }}</span>
</div>
</template>
<script setup>
const props = defineProps({
title: {
type: [Number, String],
default: "",
},
});
</script>
<style scoped>
.gap-title {
font-size: 18px;
font-weight: 600;
color: #1a1a1a;
display: flex;
align-items: center;
margin-bottom: 20px;
}
.gap-title span {
margin-right: 8px;
}
.gap-title::before {
content: "";
display: inline-block;
margin-right: 8px;
width: 4px;
height: 14px;
background-color: #3759be;
border-radius: 2px;
}
/* .gap-title::after {
content: "";
display: inline-block;
flex: 1;
border-top: 1px dashed #dadee7;
} */
</style>
src/bg-ui/index.js
View file @ 2479f9a2
/**
* 全局组件
*/
import BgIcon from './bg-icon.vue'
import BgNav from './bg-nav.vue'
import BgList from './bg-list.vue'
import BgDetail from './bg-detail.vue'
import BgFiltrate from './bg-filtrate.vue'
import BgTable from './bg-table.vue'
import BgTablePro from './bg-table-pro.vue'
import BgTableBtn from './bg-table-btn.vue'
import BgTabs from './bg-tabs.vue'
import BgTab from './bg-tab.vue'
import BgLayoutCard from './bg-layout-card.vue'
import BgCard from './bg-card.vue'
import BgInfo from './bg-info.vue'
import BgBtns from './bg-btns.vue'
import BgUpload from './bg-upload.vue'
import BgUploadImage from './bg-upload-image.vue'
import BgTags from './bg-tags.vue'
import BgSwitch from './bg-switch.vue'
import BgRichText from './bg-rich-text.vue'
import BgCodeEditor from './bg-code-editor.vue'
import BgFilter from './bg-filter.vue'
import BgSort from './bg-sort.vue'
import BgFilterDate from './bg-filter-date.vue'
import bgUserUploadImage from './bg-user-upload-image.vue'
import bgDetailTable from './bg-detail-table.vue'
import bgDetailTable2 from './bg-detail-table2.vue'
import debounce from './debounce'
import BgPagination from './bg-pagination.vue'
import BgInnerTabs from './bg-inner-tabs.vue'
import BgFilterGroup from './bg-filter-group.vue'
import BgSwitchEle from './bg-switch-ele.vue'
import BgTableBtns from './bg-table-btns.vue'
import BgTableBtns2 from './bg-table-btns2.vue'
import BgPermission from './bg-permission.vue'
import BgIcon from "./bg-icon.vue";
import BgNav from "./bg-nav.vue";
import BgList from "./bg-list.vue";
import BgDetail from "./bg-detail.vue";
import BgFiltrate from "./bg-filtrate.vue";
import BgTable from "./bg-table.vue";
import BgTablePro from "./bg-table-pro.vue";
import BgTableBtn from "./bg-table-btn.vue";
import BgTabs from "./bg-tabs.vue";
import BgTab from "./bg-tab.vue";
import BgLayoutCard from "./bg-layout-card.vue";
import BgCard from "./bg-card.vue";
import BgInfo from "./bg-info.vue";
import BgBtns from "./bg-btns.vue";
import BgUpload from "./bg-upload.vue";
import BgUploadImage from "./bg-upload-image.vue";
import BgTags from "./bg-tags.vue";
import BgSwitch from "./bg-switch.vue";
import BgRichText from "./bg-rich-text.vue";
import BgCodeEditor from "./bg-code-editor.vue";
import BgFilter from "./bg-filter.vue";
import BgSort from "./bg-sort.vue";
import BgFilterDate from "./bg-filter-date.vue";
import bgUserUploadImage from "./bg-user-upload-image.vue";
import bgDetailTable from "./bg-detail-table.vue";
import bgDetailTable2 from "./bg-detail-table2.vue";
import debounce from "./debounce";
import BgPagination from "./bg-pagination.vue";
import BgInnerTabs from "./bg-inner-tabs.vue";
import BgFilterGroup from "./bg-filter-group.vue";
import BgSwitchEle from "./bg-switch-ele.vue";
import BgTableBtns from "./bg-table-btns.vue";
import BgTableBtns2 from "./bg-table-btns2.vue";
import BgPermission from "./bg-permission.vue";
import BgFormGap from "./bg-form-gap.vue";
const components = {
BgIcon,//字体图标
BgIcon, //字体图标
BgNav, // 左侧导航
BgList, // 列表页布局
BgDetail, // 详情页布局
......@@ -56,21 +57,22 @@ const components = {
BgTags, // 标签
BgSwitch, // 开关
BgRichText, // 富文本
BgCodeEditor,//代码输入
BgCodeEditor, //代码输入
BgFilter, // 首页筛选
BgSort, // 首页排序
BgFilterDate,
bgUserUploadImage,
bgDetailTable,//详情展示组件1
bgDetailTable2,//详情展示组件2
debounce,//防抖组件
BgPagination,// 分页组件
BgInnerTabs,//内部tab
BgFilterGroup,//高级搜索
BgSwitchEle,// 基于element-plus封装的switch
BgTableBtns,// 表格按钮组
BgPermission,// 菜单选择
bgDetailTable, //详情展示组件1
bgDetailTable2, //详情展示组件2
debounce, //防抖组件
BgPagination, // 分页组件
BgInnerTabs, //内部tab
BgFilterGroup, //高级搜索
BgSwitchEle, // 基于element-plus封装的switch
BgTableBtns, // 表格按钮组
BgPermission, // 菜单选择
BgTableBtns2, // 表格按钮组-新
BgFormGap,
};
const install = (Vue) => {
......
src/main.js
View file @ 2479f9a2
import { createApp } from 'vue'
import { createApp } from "vue";
import ElementPlus from 'element-plus'
import 'element-plus/dist/index.css'
import locale from 'element-plus/lib/locale/lang/zh-cn'
import ElementPlus from "element-plus";
import "element-plus/dist/index.css";
import locale from "element-plus/lib/locale/lang/zh-cn";
import * as ElementPlusIconsVue from '@element-plus/icons-vue'
import * as ElementPlusIconsVue from "@element-plus/icons-vue";
import bgui from "@/bg-ui";
import "@/bg-ui/index.scss";
import msgSdk from './msg-sdk/index.js';
import msgSdk from "./msg-sdk/index.js";
import App from './App.vue'
import App from "./App.vue";
import router from './router'
import {generateRoutes} from './router/index.js'
import router from "./router";
import { generateRoutes } from "./router/index.js";
import "../src/assets/css/font.css";
import "../src/assets/css/index.css";
import "../src/assets/item.css";
import '../src/assets/css/font.css'
import '../src/assets/css/index.css'
import '../src/assets/item.css'
import store from "@/store";
import store from '@/store';
import i18n from "./i18n/i18n.js";
import i18n from './i18n/i18n.js'
import axios from "./request/http.js";
import axios from './request/http.js'
const createVue = createApp(App)
const createVue = createApp(App);
createVue.use(ElementPlus, { locale });
function getMsgAppid() {
axios.get(`/apaas/system/v5/message/account`).then(res => {
axios.get(`/apaas/system/v5/message/account`).then((res) => {
if (res.data.code == 200) {
createVue.use(msgSdk, {
requestUrl: 'https://msg.wodcloud.com', // 请求地址
requestUrl: "https://msg.wodcloud.com", // 请求地址
appID: decodeURIComponent(escape(window.atob(res.data.data.app_id))), // 应用id
secretKey: decodeURIComponent(escape(window.atob(res.data.data.secret_key))), // 应用密钥
userId: '',
userType: '',
roleId: '',
organization: '',
})
userId: "",
userType: "",
roleId: "",
organization: "",
});
}
})
});
}
// getMsgAppid()
for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
createVue.component(key, component)
createVue.component(key, component);
}
createVue.config.globalProperties.$axios = axios
createVue.config.globalProperties.$axios = axios;
import menu from './router/function.js'
import menu from "./router/function.js";
//获取用户信息
function getUser() {
return axios.get(`/apaas/system/v5/user/getUserInfo`)
return axios.get(`/apaas/system/v5/user/getUserInfo`);
}
//获取用户菜单信息
function getMenu(search) {
return axios.get(`/apaas/system/v5/menu/user/tree?search=${search}`)
return axios.get(`/apaas/system/v5/menu/user/tree?search=${search}`);
}
//处理菜单成为对象
function getMenuObj(menu,parentRowPath,menuObj){
menu.forEach((e,idx) => {
e.rowPath = parentRowPath + '.' + idx
menuObj[e.path] = e
if(e.children&&e.children.length){
getMenuObj(e.children,e.rowPath,menuObj)
function getMenuObj(menu, parentRowPath, menuObj) {
menu.forEach((e, idx) => {
e.rowPath = parentRowPath + "." + idx;
menuObj[e.path] = e;
if (e.children && e.children.length) {
getMenuObj(e.children, e.rowPath, menuObj);
}
});
}
Promise.all([getUser(),getMenu('dadb2d3f-e263-48d1-9389-42acb9ea49f8')]).then(res => {
console.log(res);
if (res[0].data.code == 200&&res[1].data.code == 200) {
Promise.all([getUser(), getMenu("dadb2d3f-e263-48d1-9389-42acb9ea49f8")])
.then((res) => {
if (res[0].data.code == 200 && res[1].data.code == 200) {
//已登录则记录菜单和用户信息
let data = res[1].data.data&&res[1].data.data[0].children||[]
store.commit('setUserInfo', res[0].data.data)
let data = (res[1].data.data && res[1].data.data[0].children) || [];
store.commit("setUserInfo", res[0].data.data);
// if (res[0].data.data.userType == 1) {//超管
store.commit('setMenu', data)
menu.menuToRouter(data)
console.log(menu);
store.commit('setRoute',data)
//存储菜单对象信息
let menuObj = {}
getMenuObj(data,'',menuObj)
store.commit('setMenuObj',menuObj)
console.log(menuObj);
store.commit("setMenu", data);
console.log("data", data);
menu.menuToRouter(data);
store.commit("setRoute", data);
//存储菜单对象信息
let menuObj = {};
getMenuObj(data, "", menuObj);
store.commit("setMenuObj", menuObj);
// }
}
generateRoutes()
createVue.use(ElementPlus).use(store).use(router).use(i18n).use(bgui)
createVue.mount('#app')
}).catch(() => {
createVue.use(ElementPlus).use(store).use(router).use(i18n).use(bgui)
createVue.mount('#app')
generateRoutes();
createVue.use(ElementPlus).use(store).use(router).use(i18n).use(bgui);
createVue.mount("#app");
})
.catch(() => {
createVue.use(ElementPlus).use(store).use(router).use(i18n).use(bgui);
createVue.mount("#app");
});
//后期加入权限处理，参考msg/ui
src/page/main/config/accessRule/index.vue 0 → 100644
View file @ 2479f9a2
This diff is collapsed.
src/page/main/config/loginPage/index.vue 0 → 100644
View file @ 2479f9a2
<!-- 角色管理 -->
<template>
<div class="page_container">
<bg-breadcrumb></bg-breadcrumb>
<div class="main_container">
<div class="form_content apaas_scroll_nor">
<el-form ref="refForm" :model="formData" :rules="rules" label-width="82px" class="registerForm">
<el-form-item label="LOGO" prop="logo">
<bg-upload-image
v-model="formData.logo"
:fileSize="1"
:showTips="true"
customTips="请选择图片上传：支持jpg、png等格式，图片需小于500KBB"
:limit="1"
listType="picture-card"
:accept="['.jpg', '.jpeg', '.png']"></bg-upload-image>
</el-form-item>
<el-form-item label="登录背景图" prop="banner">
<bg-upload-image
v-model="formData.banner"
:fileSize="1"
:showTips="true"
customTips="请选择图片上传：大小1920 * 1026像素支持jpg、png等格式，图片需小于1MB"
:limit="1"
listType="picture-card"
:accept="['.jpg', '.jpeg', '.png']"></bg-upload-image>
</el-form-item>
<bg-form-gap title="底部所有权内容"></bg-form-gap>
<el-form-item label="内容" prop="force">
<el-input placeholder="例如：Copyright © 某某大数据, All Rights Reserved." maxlength="100"></el-input>
</el-form-item>
<bg-form-gap title="底部ICP备案"></bg-form-gap>
<el-form-item label="内容" prop="force">
<el-input placeholder="请输入" maxlength="100"></el-input>
</el-form-item>
<el-form-item label="跳转连接" prop="force">
<el-input placeholder="例如：https://...或http://..." maxlength="100"></el-input>
</el-form-item>
<bg-form-gap title="底部公安网备案"></bg-form-gap>
<el-form-item label="内容" prop="force">
<el-input placeholder="请输入" maxlength="100"></el-input>
</el-form-item>
<el-form-item label="跳转连接" prop="force">
<el-input placeholder="例如：https://...或http://..." maxlength="100"></el-input>
</el-form-item>
<bg-form-gap title="法律声明"></bg-form-gap>
<el-form-item label="跳转连接" prop="force">
<el-input placeholder="例如：https://...或http://..." maxlength="100"></el-input>
</el-form-item>
<bg-form-gap title="隐私政策"></bg-form-gap>
<el-form-item label="跳转连接" prop="force">
<el-input placeholder="例如：https://...或http://..." maxlength="100"></el-input>
</el-form-item>
</el-form>
</div>
<div class="operate_btns">
<el-button type="primary" @click="save"> 保存 </el-button>
</div>
</div>
</div>
</template>
<script setup>
import { Search } from "@element-plus/icons-vue";
import { reactive, toRefs, ref, onBeforeMount, nextTick } from "vue";
import axios from "../../../../request/http.js";
import { ElMessage } from "element-plus";
import { useRouter } from "vue-router";
import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
//表单数据
const formData = reactive({
logo: "",
});
//表单校验规则
const rules = reactive({});
</script>
<style lang="scss" scoped>
.page_container {
.main_container {
position: relative;
margin: 0 0 16px;
width: 100%;
height: calc(100% - 62px);
padding: 32px 0 70px;
overflow: auto;
background-color: #fff;
box-shadow: 0px 1px 4px 0px rgba(0, 7, 101, 0.15);
border-radius: 6px;
.form_content {
overflow: auto;
height: 100%;
padding-left: 24px;
.el-form {
width: 60%;
::v-deep .el-form-item {
&:nth-of-type(1) {
.el-upload--picture-card {
width: 120px;
height: 120px;
}
}
&:nth-of-type(2) {
.el-upload--picture-card {
width: 367px;
height: 196px;
}
}
}
}
::v-deep .gap-title {
font-size: 16px;
color: #202531;
}
}
.operate_btns {
position: absolute;
bottom: 0;
width: 100%;
height: 70px;
text-align: right;
line-height: 68px;
border-top: solid 1px #e6e9ef;
.el-button {
width: 92px;
margin-right: 16px;
}
}
}
}
</style>
src/page/main/config/preference/index.vue 0 → 100644
View file @ 2479f9a2
This diff is collapsed.
src/page/main/develop/systemApproval/approval/index.vue 0 → 100644
View file @ 2479f9a2
<template>
<div class="page_container">
<bg-breadcrumb></bg-breadcrumb>
<div class="page_content">
<bg-form-gap title="注册信息"></bg-form-gap>
<bg-detail-table2 class="register_info" :list="instanceData.approveBasicInfo">
<!-- <template v-slot:approvalStatus="{ data }">
<p class="detail-module">
<span>{{ data.label }}</span>
<span>{{ data.value }}</span>
</p>
</template> -->
</bg-detail-table2>
<bg-form-gap title="审批"></bg-form-gap>
<div class="approve">
<div class="header">
<div class="left">
<span class="approve_person">平台运营者审批</span>
<span class="approve_status">待审批</span>
</div>
<div class="right">
<span class="label">申请时间：</span>
<span class="value">{{ instanceData.approveBasicInfo[5].value }}</span>
</div>
</div>
<el-form
ref="approveFormRef"
:model="instanceData.formData"
:rules="instanceData.rules"
label-width="80px"
class="approveForm">
<el-form-item label="审批单位">
<el-input disabled v-model="userInfo.organization_name" maxlength="20" />
</el-form-item>
<el-form-item label="审批人">
<el-input disabled v-model="userInfo.contact_name" maxlength="20" />
</el-form-item>
<el-form-item label="审批结果" prop="status">
<el-radio-group v-model="instanceData.formData.status">
<el-radio :label="1"> 通过 </el-radio>
<el-radio :label="0"> 驳回 </el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="审批意见" prop="comments">
<el-input
placeholder="请输入"
rows="5"
maxlength="200"
v-model="instanceData.formData.comments"
show-word-limit
type="textarea" />
</el-form-item>
</el-form>
</div>
<div class="operate_btns">
<el-button type="default" @click="cancel"> 取消 </el-button>
<el-button type="primary" @click="save"> 保存 </el-button>
</div>
</div>
</div>
</template>
<script setup>
import { reactive, onBeforeMount, computed, ref } from "vue";
import { useRouter, useRoute } from "vue-router";
import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
import axios from "@/request/http.js";
import { ElMessage } from "element-plus";
// import { dateStringTransform } from "@/services/helper";
import store from "@/store";
const route = useRoute();
const router = useRouter();
const approveFormRef = ref(null);
const instanceData = reactive({
approveBasicInfo: [
{
key: "organization_name",
label: "所属机构",
value: "",
// slot: "approvalStatus",
},
{
key: "business_name",
label: "业务系统名称",
value: "",
},
{
key: "system_account",
label: "账号",
value: "",
},
{
key: "phone",
label: "手机号",
value: "",
},
{
key: "develop_name",
label: "开发厂商名称",
value: "",
},
{
key: "created_time",
label: "提交时间",
value: "",
},
{
key: "contact_name",
label: "联系人",
value: "",
},
{
key: "contact_phone",
label: "联系人手机号",
value: "",
},
{
key: "business_desc",
label: "业务系统描述",
value: "",
},
],
formData: {
status: "",
comments: "",
},
rules: {
status: [
{
required: true,
message: "请选择状态",
},
],
},
});
const userInfo = computed(() => {
return store.state.userInfo;
});
onBeforeMount(() => {
getApproveInfo();
});
const getApproveInfo = () => {
axios
.get(`/apaas/system/v5/user/approval/detail/${route.query.id}`)
.then((res) => {
if (res.data.code == 200) {
const result = res.data.data || {};
instanceData.approveBasicInfo.forEach((item) => {
// if (item.key === "created_time") {
// item.value = dateStringTransform(result[item.key]);
// return;
// }
item.value = result[item.key];
});
} else {
ElMessage.error(res.data.data);
}
})
.catch((err) => {
ElMessage.error(err);
});
};
//取消
const cancel = () => {};
//保存
const save = () => {
approveFormRef.value.validate((val) => {
if (val) {
const params = {
...instanceData.formData,
id: +route.query.id,
};
axios.post(`/apaas/system/v5/user/approval`, params).then((res) => {
if (res.data.code == "200") {
ElMessage.success("操作成功");
router.push("/develop/systemApproval");
} else {
ElMessage.error(res.data.data);
}
});
}
});
};
</script>
<style lang="scss" scoped>
.page_content {
position: relative;
padding: 24px 0 68px 24px;
.register_info {
margin-bottom: 24px;
width: 960px;
}
.approve {
overflow: hidden;
width: 1127px;
height: 378px;
background-color: #ffffff;
border-radius: 4px;
border: solid 1px #e3e4ef;
.header {
display: flex;
justify-content: space-between;
height: 38px;
padding: 0 16px;
border-bottom: 1px solid #e3e4ef;
background-color: #f9fafc;
.left {
display: flex;
justify-content: space-between;
align-items: center;
width: 150px;
height: 100%;
.approve_person {
display: inline-block;
width: 98px;
font-size: 14px;
font-weight: 600;
color: #242c43;
}
.approve_status {
display: inline-block;
width: 46px;
height: 18px;
font-size: 12px;
text-align: center;
color: #e56600;
background-color: #fcf0e6;
border-radius: 3px;
border: solid 1px #f2b380;
}
}
.right {
display: flex;
justify-content: space-between;
align-items: center;
width: 210px;
height: 100%;
font-size: 14px;
color: #7784a6;
.value {
color: #242c43;
}
}
}
.approveForm {
padding: 24px 24px 0 24px;
::v-deep .el-form-item {
margin-bottom: 24px;
}
::v-deep .el-form-item__label,
::v-deep .el-radio__label {
color: var(--el-text-color-primary);
}
}
}
.operate_btns {
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: 64px;
padding-right: 16px;
line-height: 64px;
text-align: right;
border-top: solid 1px #e6e9ef;
.el-button {
width: 92px;
& + .el-button {
margin-left: 16px;
}
}
}
}
</style>
src/page/main/develop/systemApproval/detail/index.vue 0 → 100644
View file @ 2479f9a2
<template>
<div class="page_container">
<bg-breadcrumb></bg-breadcrumb>
<div class="page_content">
<bg-form-gap title="注册信息"></bg-form-gap>
<bg-detail-table2 class="register_info" :list="instanceData.approveBasicInfo"> </bg-detail-table2>
<bg-form-gap title="审批信息"></bg-form-gap>
<bg-detail-table2 class="approve_info" :list="instanceData.approveInfo"> </bg-detail-table2>
</div>
</div>
</template>
<script setup>
import { reactive, onBeforeMount } from "vue";
import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
import { useRoute } from "vue-router";
import axios from "@/request/http.js";
import { ElMessage } from "element-plus";
const route = useRoute();
const instanceData = reactive({
approveBasicInfo: [
{
key: "organization_name",
label: "所属机构",
value: "",
// slot: "approvalStatus",
},
{
key: "business_name",
label: "业务系统名称",
value: "",
},
{
key: "system_account",
label: "账号",
value: "",
},
{
key: "phone",
label: "手机号",
value: "",
},
{
key: "develop_name",
label: "开发厂商名称",
value: "",
},
{
key: "created_time",
label: "提交时间",
value: "",
},
{
key: "contact_name",
label: "联系人",
value: "",
},
{
key: "contact_phone",
label: "联系人手机号",
value: "",
},
{
key: "business_desc",
label: "业务系统描述",
value: "",
},
],
approveInfo: [
{
key: "status",
label: "审核状态",
value: "",
},
{
key: "approval_by",
label: "审核人",
value: "",
},
{
key: "approval_time",
label: "审批时间",
value: "",
},
{
key: "comments",
label: "审批意见",
value: "",
},
],
});
onBeforeMount(() => {
getApproveInfo();
});
const getApproveInfo = () => {
axios
.get(`/apaas/system/v5/user/approval/detail/${route.query.id}`)
.then((res) => {
if (res.data.code == 200) {
const result = res.data.data || {};
instanceData.approveBasicInfo.forEach((item) => {
// if (item.key === "created_time") {
// item.value = dateStringTransform(result[item.key]);
// return;
// }
item.value = result[item.key];
});
instanceData.approveInfo.forEach((item) => {
if (item.key === "status") {
item.value = result[item.key] === 1 ? "通过" : "驳回";
}
item.value = result[item.key];
});
} else {
ElMessage.error(res.data.data);
}
})
.catch((err) => {
ElMessage.error(err);
});
};
</script>
<style lang="scss" scoped>
.page_content {
position: relative;
padding: 24px 0 68px 24px;
.register_info,
.approve_info {
margin-bottom: 24px;
width: 960px;
}
}
</style>
src/page/main/develop/systemApproval/index.vue 0 → 100644
View file @ 2479f9a2
This diff is collapsed.
src/page/main/log/system/index.vue 0 → 100644
View file @ 2479f9a2
This diff is collapsed.
src/page/main/log/userAccount/index.vue 0 → 100644
View file @ 2479f9a2
This diff is collapsed.
src/page/main/log/userBehavior/index.vue 0 → 100644
View file @ 2479f9a2
This diff is collapsed.
src/router/function.js
View file @ 2479f9a2
......@@ -100,7 +100,7 @@ var adminMenu = [
dict_group_id: "64c156e0-bfff-4bfc-a63a-56effe130a25",
menuType: 2,
},
]
],
},
],
dict_group_id: "64c156e0-bfff-4bfc-a63a-56effe130a25",
......@@ -169,7 +169,7 @@ var adminMenu = [
dict_group_id: "09938937-3db9-47de-b967-7777ea4ebb2d",
menuType: 1, //system:64c156e0-bfff-4bfc-a63a-56effe130a25:apaas后管,能力注册页等 font:2cb4f767-fad7-44f2-afa3-f055e15dd2b6:apaas前台页 manager:09938937-3db9-47de-b967-7777ea4ebb2d:apaas管理中心 知识中心：26d3903a-863e-4efc-b53e-0fb8772ddaa4
path: "/system/organization",
children:[
children: [
{
menuName: "新增平台用户",
dict_group_id: "09938937-3db9-47de-b967-7777ea4ebb2d",
......@@ -198,27 +198,27 @@ var adminMenu = [
show: false,
path: "/system/organization/org-detail",
},
]
],
},
{
menuName: "角色管理",
dict_group_id: "09938937-3db9-47de-b967-7777ea4ebb2d",
menuType: 1, //system:64c156e0-bfff-4bfc-a63a-56effe130a25:apaas后管,能力注册页等 font:2cb4f767-fad7-44f2-afa3-f055e15dd2b6:apaas前台页 manager:09938937-3db9-47de-b967-7777ea4ebb2d:apaas管理中心 知识中心：26d3903a-863e-4efc-b53e-0fb8772ddaa4
path: "/system/role",
children:[
children: [
{
menuName:'新增角色',
menuType:2,
menuName: "新增角色",
menuType: 2,
dict_group_id: "09938937-3db9-47de-b967-7777ea4ebb2d",
path: "/system/role/add",
},
{
menuName:'编辑角色',
menuType:2,
menuName: "编辑角色",
menuType: 2,
dict_group_id: "09938937-3db9-47de-b967-7777ea4ebb2d",
path: "/system/role/edit",
},
]
],
},
],
},
......@@ -241,13 +241,13 @@ var adminMenu = [
},
];
function getName(str){
if(str=='/'){
return 'index'
function getName(str) {
if (str == "/") {
return "index";
}
let temp = str.slice(1)
temp = temp.replaceAll('/','-')
return temp
let temp = str.slice(1);
temp = temp.replaceAll("/", "-");
return temp;
}
function getViews(path) {
......@@ -271,14 +271,13 @@ function getViews(path) {
break;
}
// 然后动态路由的时候这样来取
console.log(modules["../page/main" + path + "/index.vue"]);
return modules["../page/main" + path + "/index.vue"];
}
//处理路由方法
var menuToRouter = (menu) => {
menu.forEach((e) => {
e.name = getName(e.path)
e.name = getName(e.path);
if (e.children && e.menuType == 0) {
// 其他层级作为文件夹，只提供父级
e.component = () => import("../page/parent/parent.vue");
......@@ -286,28 +285,25 @@ var menuToRouter = (menu) => {
} else if (e.children && e.menuType !== 0) {
//叶子层级需要加载到对应文件
//对首页做兼容
if(e.source){
console.log(`@/page/main${e.source}/index.vue`);
if (e.source) {
e.component = getViews(e.source);
}else{
console.log(`@/page/main${e.path}/index.vue`);
} else {
e.component = getViews(e.path);
}
menuToRouter(e.children);
} else {
console.log(`@/page/main${e.path}/index.vue`);
//叶子层级需要加载到对应文件
//对首页做兼容
if (e.path == "/") {
if(e.source){
if (e.source) {
e.component = () => import(`../page/main/${e.source}/index.vue`);
}else{
} else {
e.component = () => import("../page/main/index/index.vue");
}
} else {
if(e.source){
if (e.source) {
e.component = getViews(e.source);
}else{
} else {
e.component = getViews(e.path);
}
}
......
src/router/index.js
View file @ 2479f9a2
......@@ -37,32 +37,31 @@ const routes = [{
show: true,
component: () => import('../page/404.vue')
},
]
];
//重新创建router
function newRouterFunc() {
return createRouter({
history: createWebHashHistory(),
routes
routes,
});
}
const router = newRouterFunc()
const router = newRouterFunc();
function inWhiteList(toPath) {
//配置白名单
const whiteList = ['/login', '/registe', '/password']
const path = whiteList.find((value) => {
// 使用正则匹配
const reg = new RegExp('^' + value)
return reg.test(toPath)
})
return !!path
const reg = new RegExp("^" + value);
return reg.test(toPath);
});
return !!path;
}
router.beforeEach((to, from, next) => {
const userInfo = store.state.userInfo
const userInfo = store.state.userInfo;
console.log(store.state.route);
//已登录不可跳转登陆页
......@@ -75,30 +74,27 @@ router.beforeEach((to, from, next) => {
// 检查to.path是否存在于免登陆白名单
if (inWhiteList(to.path)) {
next()
next();
} else {
// 判断是否已经登录，未登录则重定向到首页或其他页面（通过query传参记录原来的路径）
// 根据配置判断是否跳转第三方登录，跳转第三方登录则不跳login
// axios封装中也需要对是否登录过期进行判断，如果登录过期，则跳转登录页，具体跳转地址根据配置来·
if (!userInfo) {
next({
path: '/login',
})
} else {
}
path: "/login",
});
} else {}
}
//判读是否匹配，否则跳转404
if (to.matched.length !== 0) {
next()
next();
} else {
return next({
path: '/404'
})
}
})
});
// 在路由完成初始导航时调用，如果有异步操作放置到这里
// 请求相应的角色和菜单
......@@ -117,7 +113,7 @@ function addRoute(router, routers) {
}
export function generateRoutes() {
const _asyncRoutes = store.state.route
const _asyncRoutes = store.state.route;
if (_asyncRoutes) {
//动态添加路由
......@@ -131,13 +127,12 @@ export function generateRoutes() {
})
console.log(router.getRoutes());
}
//新创建一个router替代之前的router，并把matcher方法替换成新的router的matcher
export function resetRouter() {
const newRouter = newRouterFunc()
router.matcher = newRouter.matcher
const newRouter = newRouterFunc();
router.matcher = newRouter.matcher;
}
export default router
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment