diff --git a/src/bg-ui/bg-filter-group.vue b/src/bg-ui/bg-filter-group.vue new file mode 100644 index 0000000000000000000000000000000000000000..ed64fd5314a84a7ad0dc723f01e41ac4dd821664 --- /dev/null +++ b/src/bg-ui/bg-filter-group.vue @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + 高级搜索 + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss index 1dda1f4b9694778d0a4cd27d135a06088478521b..6c40e06d0f63b096decfe1a1637692278f367fd9 100644 --- a/src/bg-ui/index.scss +++ b/src/bg-ui/index.scss @@ -2390,4 +2390,73 @@ a { .card-content { padding: 24px; } +} + +.bg-filter-group { + width: 100%; + padding: 16px; + border-bottom: 1px solid #e6e9ef; + .top-filter { + width: 100%; + display: flex; + .left-slot { + flex: 1; + } + .right-filter { + width: 398px; + justify-content: end; + display: flex; + + .el-input { + width: 280px; + height: 36px; + .el-input-group__append { + border-radius: 0 4px 4px 0; + background-color: #f7f7f9; + padding: 0; + .append-btn { + padding: 0 16px; + cursor: pointer; + } + } + } + .more-btn { + margin-left: 16px; + width: 102px; + box-sizing: border-box; + border: 1px solid #e6e9ef; + border-radius: 4px; + height: 36px; + .more-filter { + width: 100px; + border: none; + height: 34px; + padding: 10px 15px; + line-height: 1; + &:active, + &:hover{ + background-color: #fff; + color: #3759be; + } + &:focus { + background-color: #fff; + } + } + } + .more-btn1 { + height: 53px; + border-bottom: 1px solid #fff; + border-radius: 4px 4px 0 0; + margin-bottom: -1px; + } + } + } + .filter-group { + display: flex; + align-items: flex-end; + border-radius: 4px 0 4px 4px; + width: 100%; + border: 1px solid #e6e9ef; + padding: 24px 16px 8px; + } } \ No newline at end of file diff --git a/src/components/bg-menu.vue b/src/components/bg-menu.vue index 09ba727a045a7a27de434459ea7e8f266b585fb4..8f6252d488cd400c0e738973a443d52bca9128c6 100644 --- a/src/components/bg-menu.vue +++ b/src/components/bg-menu.vue @@ -169,7 +169,7 @@ export default { this.$trace.setOptionValue('appID',item.value) }, getLogo(){ - // this.$axios.get(`/apaas/backmgt/getPicAndSystemName`).then(res=>{ + // this.$axios.get(`/apaas/system/getPicAndSystemName`).then(res=>{ // if(res.data.code==200){ // let data = res.data.data // this.name=data.systemName @@ -186,7 +186,7 @@ export default { }, menuAction(n,parent) { if (n == "logout") { - this.$axios.get(`/apaas/backmgt/logout`).then(res=>{ + this.$axios.get(`/apaas/system/logout`).then(res=>{ if(res.data.code=='200'){ this.$router.push('/login') this.$store.commit('setUserInfo',null) @@ -210,7 +210,7 @@ export default { if(this.$store.state.menuObj[n].menuType=='font'||this.$store.state.menuObj[n].menuType=='system'){ temp = '/apaas/ui/#' }else if(this.$store.state.menuObj[n].menuType=='manager'){ - temp = '/apaas/system/uir/#' + temp = '/apaas/system/ui/#' } window.location.href = temp+n } @@ -248,7 +248,7 @@ export default { if(this.$store.state.menuObj[path].menuType=='font'||this.$store.state.menuObj[path].menuType=='system'){ temp = '/apaas/ui/#' }else if(this.$store.state.menuObj[path].menuType=='manager'){ - temp = '/apaas/system/uir/#' + temp = '/apaas/system/ui/#' } window.location.href = temp+path } diff --git a/src/main.js b/src/main.js index 8a0c1ac2e050d155908ded2e689c4399db57997a..2bfab5f3434a678d6f2429d0a60e3c129001d2e6 100644 --- a/src/main.js +++ b/src/main.js @@ -10,6 +10,7 @@ import bgui from "@/bg-ui"; import "@/bg-ui/index.scss"; +console.log(bgui,"-=-=-=-=-=-=-=-=-=") import App from './App.vue' import router from './router' diff --git a/src/page/login/index.vue b/src/page/login/index.vue index dd6daffeb3c4074b27f47c2cc7ac17ca1ee9a696..a12a68d4964f7698bbdf301ef25945f6cea6759f 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -57,7 +57,7 @@ export default { computed: {}, created() { console.log(111); - this.getImg(); + // this.getImg(); }, mounted() {}, methods: { diff --git a/src/page/main/config/dict/index.vue b/src/page/main/config/dict/index.vue index 1bffe1ed10df7e204de6f0b1cf7d40f95fc85c1b..b9100cc5d0a52f0669ac87f0f1febdc897bdc54f 100644 --- a/src/page/main/config/dict/index.vue +++ b/src/page/main/config/dict/index.vue @@ -1,30 +1,248 @@ - 字典管理 + + + 配置管理 + 字典配置 + + + + + + + + + {{item.name}} + + + + + + + + + + 新建 + + + + + + {{ ["-","启用","禁用"][row.state] }} + + + {{ row.updated_time.split("+")[0].replace("T", " ").replace("Z", " ") }} + + + + 编辑 + + + 删除 + + + + + + + + - \ No newline at end of file