Skip to content

S
smart_gov_platform
Commit dc485f79 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

pref:修改页面整体样式

parent 5508646a
Show whitespace changes
Inline Side-by-side
Showing with 777 additions and 565 deletions
base-manager-ui/admin/src/App.vue
View file @ dc485f79
<template>
<div class="app">
<a-config-provider :locale="locale" :get-popup-container="popContainer">
<router-view />
</a-config-provider>
</div>
</template>
<script>
......@@ -111,4 +113,7 @@ export default {
</script>
<style lang="less" scoped>
.app {
min-width: 1600px !important;
}
</style>
base-manager-ui/admin/src/assets/css/common.css
View file @ dc485f79
......@@ -23,6 +23,9 @@
.bgg{
background-color:#1BBC9B;
}
.bgw{
background-color: #fff;
}
/* 版心 */
.container{
width:1200px;
......@@ -52,6 +55,12 @@
.jce{
justify-content: space-evenly;
}
.jc-start{
justify-content: flex-start;
}
.jc-end{
justify-content: flex-end;
}
.aic{
align-items: center;
}
......@@ -95,6 +104,9 @@
.ml25{
margin-left:25px;
}
.mr5 {
margin-right: 5px;
}
.mr10{
margin-right:10px;
}
......@@ -226,3 +238,12 @@
.pointer{
cursor: pointer;
}
.auto-scroll-y{
overflow-y: auto;
}
.auto-scroll-x{
overflow-y: auto;
}
.auto-scroll{
overflow: auto;
}
\ No newline at end of file
base-manager-ui/admin/src/assets/css/common.less
View file @ dc485f79
......@@ -24,11 +24,24 @@
margin-right: 10px;
text-align: right;
}
.ant-pagination {
margin: 10px !important;
}
.ant-tabs-nav-container {
border-bottom: 1px solid rgb(224, 224, 224) !important;
}
.ant-tabs-tab{
font-weight: bold;
color: rgba(0, 0, 0, 0.65);
i{
color:#1890ff
}
}
.ant-spin-nested-loading,.ant-spin-container{
width:100%;
height:100%;
}
/* 溢出表格滚动条 */
/* 表格 */
/*.table 为全局表格自定义样式*/
......@@ -59,12 +72,12 @@
}
::-webkit-scrollbar-thumb {
border-radius: 6px;
border-radius: 3px;
background-color: rgba(144, 147, 153, 0.5);
}
::-webkit-scrollbar-track {
border-radius: 6px;
border-radius: 3px;
background: rgba(144, 147, 153, 0);
}
......
base-manager-ui/admin/src/components/TabHeader.vue 0 → 100644
View file @ dc485f79
<template>
<div class="tab-header flex jcb aic">
<div>
<a-icon :type="icon" class="mr5 primary" />
<span class="label">{{ label }}</span>
</div>
<div>
<slot> </slot>
</div>
</div>
</template>
<script>
export default {
props: {
icon: {
type: String,
default: "database",
},
label: {
type: String,
default: "",
},
},
};
</script>
<style lang="less" scoped>
.tab-header {
display: flex;
align-items: center;
width: 100%;
height: 45px;
padding: 0px 15px;
font-size: 14px;
flex-shrink: 0;
position: relative;
cursor: default;
border-bottom: 1px solid rgb(224, 224, 224);
.label {
font-weight: bold;
color: rgba(0, 0, 0, 0.65);
}
}
</style>
\ No newline at end of file
base-manager-ui/admin/src/components/sitetree/index.vue
View file @ dc485f79
<template>
<div class="sitetree ff">
<span style="font-weight: 600">站点结构</span>
<div class="sitetree">
<!-- <span style="font-weight: 600">站点结构</span> -->
<div class="box">
<a-tree
:load-data="onLoadData"
......@@ -86,9 +86,10 @@ export default {
</script>
<style lang="less" scoped>
.sitetree {
padding-top: 10px;
width: 100%;
// padding-top: 10px;
.box {
width: 224px;
width: 100%;
height: calc(100vh - 160px);
overflow-y: auto;
}
......
base-manager-ui/admin/src/layouts/header/AdminHeader.vue
View file @ dc485f79
......@@ -46,9 +46,7 @@
>初始化区域数据</a-button
>
<a-tooltip class="header-item" title="返回门户" placement="bottom">
<a :href="portalUrl + '/#/home/siteArrange'">
<a-icon type="home" /> 返回门户
</a>
<a :href="portalUrl + path"> <a-icon type="home" /> 返回门户 </a>
</a-tooltip>
<!-- <a-tooltip class="header-item" title="数据可视化" placement="bottom">
<a href="" target="_blank"> <a-icon type="setting" /> 数据可视化 </a>
......@@ -102,7 +100,7 @@ export default {
};
},
computed: {
...mapState("site", ["sysName", "sysLogo"]),
...mapState("site", ["sysName", "sysLogo", "path"]),
...mapState("setting", [
"theme",
"isMobile",
......
base-manager-ui/admin/src/pages/basicset/addmatter/AddMatter.vue
View file @ dc485f79
<template>
<div class="addmatter">
<div class="addmatter flex flexc">
<a-tabs v-model="active">
<div slot="tabBarExtraContent">
<a-space>
......@@ -7,38 +7,65 @@
<a-button @click="handleBack">返回概要列表</a-button>
</a-space>
</div>
<a-tab-pane :key="1" tab="基本信息">
<BaseMessage />
<a-tab-pane key="BaseMessage">
<span slot="tab">
<a-icon type="container" />
基本信息
</span>
</a-tab-pane>
<a-tab-pane :key="2" tab="申请材料">
<ApplyMaterial v-if="active == 2" />
<a-tab-pane key="ApplyMaterial">
<span slot="tab">
<a-icon type="container" />
申请材料
</span>
</a-tab-pane>
<a-tab-pane :key="3" tab="受理材料">
<accept-material v-if="active == 3"></accept-material>
<a-tab-pane key="AcceptMaterial">
<span slot="tab">
<a-icon type="container" />
受理材料
</span>
</a-tab-pane>
<a-tab-pane :key="4" tab="办理流程">
<Flow v-if="active == 4" />
<a-tab-pane key="Flow">
<span slot="tab">
<a-icon type="container" />
办理流程
</span>
</a-tab-pane>
<a-tab-pane :key="5" tab="收费标准">
<Rates v-if="active == 5" />
<a-tab-pane key="Rates">
<span slot="tab">
<a-icon type="container" />
收费标准
</span>
</a-tab-pane>
<a-tab-pane :key="6" tab="设定依据">
<Pursuant v-if="active == 6" />
<a-tab-pane key="Pursuant">
<span slot="tab">
<a-icon type="container" />
设定依据
</span>
</a-tab-pane>
<a-tab-pane :key="7" tab="中介服务">
<Agency v-if="active == 7" />
<a-tab-pane key="Agency">
<span slot="tab">
<a-icon type="container" />
中介服务
</span>
</a-tab-pane>
<a-tab-pane :key="8" tab="常见问题">
<Question v-if="active == 8" />
<a-tab-pane key="Question">
<span slot="tab">
<a-icon type="container" />
常见问题
</span>
</a-tab-pane>
</a-tabs>
<div class="flex1 pdr15 pdb15 pdl15 auto-scroll-y">
<components :is="active"></components>
</div>
</div>
</template>
......@@ -55,7 +82,7 @@ import Question from "./components/question.vue";
export default {
data() {
return {
active: 1,
active: "BaseMessage",
};
},
......@@ -92,11 +119,12 @@ export default {
<style lang='less' scoped>
.addmatter {
width: 100%;
height: auto;
padding-left: 10px;
padding-right: 10px;
height: 100%;
background-color: #fff;
}
/deep/.ant-tabs-extra-content {
padding-right: 20px;
}
/deep/.ant-tabs-nav-container {
border-bottom: 1px solid #f0f0f0 !important;
}
......
base-manager-ui/admin/src/pages/basicset/addmatter/Synopsis.vue
View file @ dc485f79
<template>
<!-- 事项概要 -->
<div class="synopsis">
<a-tabs default-active-key="1">
<div class="synopsis flex flexc">
<TabHeader label="事项概要信息">
<a-button @click="handleBack">返回上一级</a-button>
</TabHeader>
<div class="pd15 flex1 auto-scroll-y">
<AddSynopsis></AddSynopsis>
</div>
<!-- <a-tabs default-active-key="1">
<a-button slot="tabBarExtraContent" @click="handleBack"
>返回上一级</a-button
>
<a-tab-pane key="1" tab="事项概要信息">
<AddSynopsis></AddSynopsis>
</a-tab-pane>
</a-tabs>
</a-tabs> -->
</div>
</template>
<script>
import AddSynopsis from "./components/AddSynopsis.vue";
import TabHeader from "@/components/TabHeader";
export default {
components: {
AddSynopsis,
TabHeader,
},
data() {
return {};
......@@ -32,9 +40,8 @@ export default {
<style lang="less" scoped>
.synopsis {
height: auto;
width: 100%;
padding: 0px 10px;
height: 100%;
}
/deep/.ant-tabs-nav-container {
......
base-manager-ui/admin/src/pages/basicset/appmarket/AppDetails.vue
View file @ dc485f79
......@@ -5,14 +5,23 @@
<a-button slot="tabBarExtraContent" @click="handleBack"
>返回上一级</a-button
>
<a-tab-pane key="/appmarket/appdetails/appdetailspage" tab="详情">
<!-- <AppDetailsPage></AppDetailsPage> -->
<a-tab-pane key="/appmarket/appdetails/appdetailspage">
<span slot="tab">
<a-icon type="container" />
详情
</span>
</a-tab-pane>
<a-tab-pane key="/appmarket/appdetails/dataupdate" tab="数据更新">
<!-- <DataUpdata></DataUpdata> -->
<a-tab-pane key="/appmarket/appdetails/dataupdate">
<span slot="tab">
<a-icon type="interaction" />
数据更新
</span>
</a-tab-pane>
<a-tab-pane key="/appmarket/appdetails/fieldconfig" tab="数据配置">
<!-- <FieldConfig></FieldConfig> -->
<a-tab-pane key="/appmarket/appdetails/fieldconfig">
<span slot="tab">
<a-icon type="control" />
数据配置
</span>
</a-tab-pane>
</a-tabs>
<div class="details-out-box flex1">
......@@ -65,10 +74,6 @@ export default {
height: 100%;
padding: 0px 20px;
}
/deep/.ant-tabs {
height: 100%;
background-color: #fff;
}
/deep/.ant-tabs-bar,
/deep/.ant-tabs-nav-container {
border-bottom: 1px solid rgb(224, 224, 224) !important;
......
base-manager-ui/admin/src/pages/basicset/appmarket/AppMarket.vue
View file @ dc485f79
......@@ -9,10 +9,30 @@
@click="handleUpload"
>上传配置文件</a-button
>
<a-tab-pane key="/appmarket/terminalapp" tab="终端应用"> </a-tab-pane>
<a-tab-pane key="/appmarket/moveapp" tab="移动端应用"> </a-tab-pane>
<a-tab-pane key="/appmarket/blackapp" tab="应用黑名单"> </a-tab-pane>
<a-tab-pane key="/appmarket/appTheme" tab="应用主题"> </a-tab-pane>
<a-tab-pane key="/appmarket/terminalapp">
<span slot="tab">
<a-icon type="desktop" />
终端应用
</span>
</a-tab-pane>
<a-tab-pane key="/appmarket/moveapp">
<span slot="tab">
<a-icon type="tablet" />
移动端应用
</span>
</a-tab-pane>
<a-tab-pane key="/appmarket/blackapp">
<span slot="tab">
<a-icon type="solution" />
应用黑名单
</span>
</a-tab-pane>
<a-tab-pane key="/appmarket/appTheme">
<span slot="tab">
<a-icon type="flag" />
应用主题
</span>
</a-tab-pane>
</a-tabs>
<div class="app-out-box flex1">
<router-view></router-view>
......@@ -138,10 +158,7 @@ export default {
/deep/.ant-form-item {
align-items: flex-start;
}
/deep/.ant-tabs {
height: 100%;
background-color: #fff;
}
/deep/.ant-tabs-nav-container {
border-bottom: 1px solid rgb(224, 224, 224) !important;
}
......
base-manager-ui/admin/src/pages/basicset/appmarket/Index.vue
View file @ dc485f79
......@@ -47,6 +47,6 @@ export default {
<style lang="less" scoped>
.index {
width: 100%;
background-color: #fff;
height: 100%;
}
</style>
\ No newline at end of file
base-manager-ui/admin/src/pages/basicset/appmarket/components/BlackApp.vue
View file @ dc485f79
......@@ -464,8 +464,10 @@ export default {
.header {
height: 100px;
.titel {
font-size: 18px;
font-size: 14px;
margin-bottom: 15px;
font-weight: bold;
color: rgba(0, 0, 0, 0.65);
}
}
}
......
base-manager-ui/admin/src/pages/basicset/business/Index.vue
View file @ dc485f79
......@@ -11,8 +11,7 @@ export default {};
<style lang="less" scoped>
.business-matter {
width: 100%;
min-height: 100%;
height: 100%;
background-color: #fff;
display: flex;
}
</style>
\ No newline at end of file
base-manager-ui/admin/src/pages/basicset/business/business.vue
View file @ dc485f79
<template>
<div class="business flex flexc">
<a-tabs :activeKey="active" @change="changeRouter">
<a-tab-pane key="/business/businessmanage" tab="业务管理"> </a-tab-pane>
<a-tab-pane key="/business/mattermanage" tab="事项管理"> </a-tab-pane>
<a-tab-pane key="/business/businessinmanage" tab="业务事项关联">
<a-tab-pane key="/business/businessmanage">
<span slot="tab">
<a-icon type="container" />
业务管理
</span>
</a-tab-pane>
<a-tab-pane key="/business/mattermanage">
<span slot="tab">
<a-icon type="read" />
事项管理
</span>
</a-tab-pane>
<a-tab-pane key="/business/businessinmanage">
<span slot="tab">
<a-icon type="switcher" />
业务事项关联
</span>
</a-tab-pane>
<a-tab-pane key="/business/workguide" tab="办事指南数据管理">
<a-tab-pane key="/business/workguide">
<span slot="tab">
<a-icon type="apartment" />
办事指南数据管理
</span>
</a-tab-pane>
</a-tabs>
<div class="business-out-box flex1">
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue
View file @ dc485f79
......@@ -556,7 +556,9 @@ export default {
.header {
height: 100px;
.titel {
font-size: 18px;
font-size: 14px;
font-weight: bold;
color: rgba(0, 0, 0, 0.65);
margin-bottom: 15px;
}
}
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue
View file @ dc485f79
......@@ -114,6 +114,9 @@
@click="handleSiteEdit(text)"
>编辑</span
>
<span href="javascript:;" style="visibility: hidden" v-else
>编辑</span
>
<span
href="javascript:;"
class="delete pointer"
......@@ -229,10 +232,7 @@
</template>
<!-- 操作 -->
<template slot="action" slot-scope="text">
<a-space size="middle">
<a href="javascript:;" class="primary" @click="handleIn(text.id)"
>加入</a
>
<a-space>
<span
href="javascript:;"
v-if="text.source == 1"
......@@ -240,6 +240,12 @@
@click="handleEdit(text.id)"
>编辑</span
>
<span href="javascript:;" style="visibility: hidden" v-else
>编辑</span
>
<a href="javascript:;" class="primary" @click="handleIn(text.id)"
>加入</a
>
<span
href="javascript:;"
class="delete pointer"
......@@ -669,7 +675,9 @@ export default {
.header {
height: 100px;
.titel {
font-size: 18px;
font-size: 14px;
font-weight: bold;
color: rgba(0, 0, 0, 0.65);
margin-bottom: 15px;
}
}
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue
View file @ dc485f79
......@@ -730,7 +730,9 @@ export default {
.header {
height: 100px;
.titel {
font-size: 18px;
font-size: 14px;
font-weight: bold;
color: rgba(0, 0, 0, 0.65);
margin-bottom: 15px;
}
}
......@@ -752,9 +754,6 @@ export default {
}
}
.ant-pagination {
margin-top: 20px;
}
.control {
display: flex;
justify-content: space-between;
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs4.vue
View file @ dc485f79
......@@ -286,7 +286,9 @@ export default {
.header {
margin-bottom: 15px;
.titel {
font-size: 18px;
font-size: 14px;
font-weight: bold;
color: rgba(0, 0, 0, 0.65);
margin-bottom: 15px;
}
}
......
base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue
View file @ dc485f79
<template>
<div class="deploy">
<a-tabs activeKey="model">
<a-tab-pane key="model" tab="部署板块管理">
<div class="deploy flex flexc">
<TabHeader label="部署板块管理"></TabHeader>
<div class="pd15 flex1 auto-scroll-y">
<div class="control pdr6">
<div>
<a-button
type="primary"
style="margin-right: 10px"
@click="handleAdd"
<a-button type="primary" style="margin-right: 10px" @click="handleAdd"
>新增模块</a-button
>
<a-button type="danger" @click="handleDelAll"
>批量删除模块</a-button
>
<a-button type="danger" @click="handleDelAll">批量删除模块</a-button>
</div>
<div class="search-box">
<a-input-search
......@@ -107,8 +102,7 @@
</template>
</a-table>
</div>
</a-tab-pane>
</a-tabs>
</div>
<!-- 新增模块 -->
<a-modal
v-model="visible"
......@@ -246,6 +240,7 @@
import { modelList, addMode, delMode } from "@/services/basicsetFun";
import PrevieModal from "@/components/PrevieModal.vue";
import StatementManage from "./components/StatementManage.vue";
import TabHeader from "@/components/TabHeader";
import { pageSizeOptions } from "@/config/pageConfig.js";
const columns = [
{
......@@ -299,6 +294,7 @@ export default {
components: {
PrevieModal,
StatementManage,
TabHeader,
},
data() {
return {
......
base-manager-ui/admin/src/pages/basicset/dept/addWindowMatter.vue
View file @ dc485f79
<template>
<div class="addwindowmatter" :class="{ isShow: Visible }">
<a-card
:title="windowInfo.name"
:bordered="false"
:headStyle="{ color: '#0595FD' }"
>
<template slot="extra">
<div class="addwindowmatter flex flexc">
<TabHeader :label="windowInfo.name">
<a-button @click="handleBack">返回上一级</a-button>
</template>
</TabHeader>
<div class="pd15 flex1 auto-scroll-y">
<div class="header">
<span class="title">窗口事项列表</span>
<div class="control pdr6">
......@@ -89,7 +85,7 @@
</template>
</a-table>
</div>
</a-card>
</div>
<!-- 新增窗口事项 -->
<a-modal
width="800px"
......@@ -185,6 +181,7 @@ import {
getWindowInfo,
} from "@/services/dept";
import YSwitch from "@/components/yswitch/YSwitch.vue";
import TabHeader from "@/components/TabHeader";
const leftColumns = [
{
title: "序号",
......@@ -250,6 +247,7 @@ const matterColumns = [
export default {
components: {
YSwitch,
TabHeader,
},
data() {
return {
......@@ -321,7 +319,6 @@ export default {
let { data, total } = res.data.data;
this.siteMatterData = data;
this.matterTotal = total;
console.log(data);
this.matterLoading = false;
},
// 站点事项翻页
......@@ -506,7 +503,9 @@ export default {
}
.title {
font-size: 16px;
font-size: 14px;
font-weight: bold;
color: rgba(0, 0, 0, 0.65);
}
.control {
height: 50px;
......
base-manager-ui/admin/src/pages/basicset/dept/department.vue
View file @ dc485f79
<template>
<div class="department">
<div class="department_tab ff">
<div class="department_tab ff mr20">
<!-- 部门管理 -->
<div class="department_left">
<div class="department_on">
<div class="department_manage">部门管理（{{ deptTotal }}）</div>
<TabHeader label="部门管理">
<span class="label">部门数量：</span>
<span class="primary">{{ deptTotal }}</span>
</TabHeader>
<div class="department_on flex aic">
<!-- <div class="department_manage">部门管理（{{ deptTotal }}）</div> -->
<a-button type="primary" @click="showModalAdd" class="department_add"
>新增部门</a-button
>
......@@ -17,7 +19,6 @@
class="department_search"
/>
</div>
</div>
<!-- 部门管理 -->
<div class="department-list">
<a-spin :spinning="deptLoading">
......@@ -73,9 +74,10 @@
</div>
<!-- 窗口管理 -->
<div class="ff window-box">
<div class="ff window-box flex flexc">
<TabHeader label="窗口管理"> </TabHeader>
<div class="pd15 flex1 auto-scroll-y">
<div class="department_right_add">
<div class="department_manage">窗口管理</div>
<div class="flex aic jcb pdr6">
<a-space>
<a-button type="primary" @click="addModal">新增窗口</a-button>
......@@ -125,7 +127,7 @@
<div class="table-content">
<!-- 表格 -->
<a-table
:scroll="{ y: 580 }"
:scroll="{ y: 560 }"
:loading="loading"
bordered
:columns="columns"
......@@ -192,6 +194,7 @@
</div>
</div>
</div>
</div>
<!-- 部门管理弹窗 -->
<adddepartment
:formVisible.sync="formVisible"
......@@ -222,6 +225,7 @@ import { pageSizeOptions } from "@/config/pageConfig.js";
import adddepartment from "./components/adddepartment.vue";
import addwindow from "./components/addwindow.vue";
import addWindowBusiness from "./components/addWindowBusiness.vue";
import TabHeader from "@/components/TabHeader";
import local from "@/utils/local";
import { mapGetters } from "vuex";
import {
......@@ -237,6 +241,7 @@ export default {
adddepartment,
addwindow,
addWindowBusiness,
TabHeader,
},
data() {
const columns = [
......@@ -634,15 +639,10 @@ export default {
height: 100%;
position: relative;
display: flex;
background-color: #fff;
.department_left {
height: 85px;
border-bottom: 1px solid #ccc;
}
background-color: #f0f2f5;
.department_on {
margin-left: 10px;
padding-bottom: 20px;
margin-right: 30px;
padding: 15px;
border-bottom: 1px solid #ccc;
}
.department_manage {
font-size: 18px;
......@@ -695,12 +695,10 @@ export default {
border-bottom: 1px solid #ccc;
}
.department_tab {
padding-top: 10px;
margin-left: 20px;
width: 340px;
border-right: 1px solid #ccc;
display: flex;
flex-direction: column;
border-radius: 4px;
/deep/ .ant-input-search {
width: 200px !important;
}
......@@ -708,9 +706,7 @@ export default {
width: 200px !important;
}
}
.department_right_add {
margin-left: 20px;
}
.department_btnadd {
border: 0;
background-color: #0595fd;
......@@ -722,7 +718,7 @@ export default {
margin-left: 10px;
}
.department_right_tab {
margin-top: 10px;
margin-top: 15px;
}
.department_right_table {
font-size: 5px;
......@@ -738,7 +734,7 @@ export default {
}
.window-box {
flex: 1;
padding: 10px;
border-radius: 4px;
}
.department-list {
flex: 1;
......
base-manager-ui/admin/src/pages/basicset/hall/Hall.vue
View file @ dc485f79
<template>
<div class="hall flex flexc">
<a-tabs :activeKey="activeKey" @change="changeRouter">
<a-tab-pane key="/hall/hallmanage" tab="大厅管理"> </a-tab-pane>
<a-tab-pane key="/hall/hallwindow" tab="大厅窗口管理"> </a-tab-pane>
<a-tab-pane key="/hall/hallmanage">
<span slot="tab">
<a-icon type="container" />
大厅管理
</span>
</a-tab-pane>
<a-tab-pane key="/hall/hallwindow">
<span slot="tab">
<a-icon type="read" />
大厅窗口管理
</span>
</a-tab-pane>
</a-tabs>
<div class="hall-out-box flex1">
<router-view></router-view>
......
base-manager-ui/admin/src/pages/basicset/hall/hallwindow/HallWindow.vue
View file @ dc485f79
......@@ -461,8 +461,10 @@ export default {
.header {
height: 100px;
.titel {
font-size: 18px;
margin-bottom: 15px;
font-size: 14px;
font-weight: bold;
color: rgba(0, 0, 0, 0.65);
}
}
}
......
base-manager-ui/admin/src/pages/basicset/holiday/festival.vue
View file @ dc485f79
<template>
<div class="festival festival">
<div class="skins_bnt btn-box pdr6">
<div class="festival flex flexc">
<TabHeader label="节假日管理"></TabHeader>
<div class="pd15 flex1 auto-scroll-y">
<div class="btn-box pdr6">
<!-- 新增按钮 -->
<a-button type="primary" @click="showModal" class="skins_btn_1"
>新增节日</a-button
......@@ -84,6 +86,7 @@
</template>
</a-table>
</div>
</div>
<!-- 弹窗 -->
<addfestivals
ref="addfestivals"
......@@ -97,6 +100,7 @@ import { getHolidayList, DelHoliday } from "@/services/festival";
import { pageSizeOptions } from "@/config/pageConfig.js";
import addfestivals from "./components/addfestivals.vue";
import local from "@/utils/local";
import TabHeader from "@/components/TabHeader";
const columns = [
{
title: "序号",
......@@ -152,6 +156,7 @@ export default {
components: {
addfestivals,
// sitetree,
TabHeader,
},
data() {
return {
......@@ -260,18 +265,7 @@ export default {
<style lang="less" scoped>
.festival {
width: 100%;
padding: 20px;
background-color: #fff;
.main {
display: flex;
.left {
width: 224px;
margin-right: 20px;
}
.right {
padding: 20px;
}
}
height: 100%;
}
.skins_btn_1 {
width: 115px;
......
base-manager-ui/admin/src/pages/basicset/jump/jump.vue
View file @ dc485f79
......@@ -22,10 +22,11 @@ export default {
"SET_siteName",
"SET_sysName",
"SET_sysLogo",
"SET_path",
]),
// 获取token
getToken() {
let { token, userInfo, siteid, siteName, sysName, sysLogo } =
let { token, userInfo, siteid, siteName, sysName, sysLogo, path } =
this.$route.query;
if (token && userInfo) {
userInfo = JSON.parse(userInfo);
......@@ -35,6 +36,7 @@ export default {
this.SET_siteName(siteName);
this.SET_sysName(sysName);
this.SET_sysLogo(sysLogo);
this.SET_path(path);
local.setLocal("siteId", siteid);
local.setLocal("siteName", siteName);
this.$router.push("/website");
......
base-manager-ui/admin/src/pages/basicset/site/website.vue
View file @ dc485f79
<template>
<div class="website p15">
<div class="left ff">
<div class="website">
<div class="left ff mr20">
<TabHeader label="站点结构"></TabHeader>
<sitetree @getArea="getArea" ref="sitetree"></sitetree>
</div>
<div class="line"></div>
<div class="main-right right ff">
<a-spin size="large" :spinning="loading">
<div class="right_box">
<div v-if="siteData.length" class="rigth-content">
<div
v-show="active === index"
v-for="(item, index) in siteData"
:key="item.id"
>
<div class="right flex1 ff flex flexc">
<TabHeader label="站点信息">
<div class="site_box">
<div class="site_message">站点信息</div>
<!-- <div class="site_message">站点信息</div> -->
<div class="btn-box">
<a-space size="middle">
<a-space size="middle" v-if="siteData.length">
<a-button
v-permission="[1]"
type="primary"
......@@ -34,7 +25,15 @@
</a-space>
</div>
</div>
</TabHeader>
<a-spin class="flex1" size="large" :spinning="loading">
<div class="right_box">
<div v-if="siteData.length" class="rigth-content">
<div
v-show="active === index"
v-for="(item, index) in siteData"
:key="item.id"
>
<div class="website-content">
<div class="base_message">
<div class="color_title">基本信息</div>
......@@ -254,6 +253,7 @@
import sitetree from "@/components/sitetree/index";
import addsite from "./components/addsite.vue";
import alldetails from "./components/alldetails.vue";
import TabHeader from "@/components/TabHeader";
import local from "@/utils/local";
import {
deleteSite,
......@@ -266,6 +266,7 @@ export default {
sitetree,
addsite,
alldetails,
TabHeader,
},
data() {
......@@ -304,12 +305,16 @@ export default {
let { data, dict } = res.data.data;
data.forEach((v) => {
v.modelIds = v.modelIds.split(",");
v.modelData = Object.keys(dict.modelIds).reduce(
v.modelData = Object.keys(dict.modelIds)
.reduce(
(pre, cur) => (
v.modelIds.includes(cur) && pre.push(dict.modelIds[cur]), pre
),
[]
);
)
.sort((a, b) => {
return a.length - b.length;
});
});
this.siteData = data;
}
......@@ -322,12 +327,16 @@ export default {
if (res.data.code === 1) {
let { data, dict } = res.data;
data.modelIds = data.modelIds.split(",");
data.modelData = Object.keys(dict.modelIds).reduce(
data.modelData = Object.keys(dict.modelIds)
.reduce(
(pre, cur) => (
data.modelIds.includes(cur) && pre.push(dict.modelIds[cur]), pre
),
[]
);
)
.sort((a, b) => {
return a.length - b.length;
});
this.siteData = [data];
}
},
......@@ -413,6 +422,12 @@ export default {
},
});
},
// 模块排序重新排序
sortModel(models) {
return models.sort((a, b) => {
return a.length - b.length;
});
},
},
};
</script>
......@@ -420,7 +435,9 @@ export default {
<style lang="less" scoped>
.website {
height: 100%;
width: 100%;
display: flex;
background-color: #f0f2f5;
.line {
width: 20px;
background-color: #f0f2f5;
......@@ -435,15 +452,24 @@ export default {
bottom: -20px;
}
}
.left {
width: 224px;
flex-shrink: 0;
border-radius: 4px;
}
.right {
width: 100%;
height: 100%;
color: #333;
padding: 10px;
background-color: #fff;
border-radius: 4px;
/deep/.ant-spin-container {
width: 100%;
height: calc(100vh - 160px);
overflow-y: auto;
}
.right_box {
height: 100%;
padding-left: 20px;
padding: 15px;
display: flex;
flex-direction: column;
justify-content: center;
......@@ -535,13 +561,14 @@ export default {
.item {
width: 140px;
height: 54px;
display: flex;
align-items: center;
justify-content: center;
background-color: rgba(30, 159, 255, 0.2);
margin-right: 10px;
margin-bottom: 10px;
padding: 6px;
display: flex;
align-items: center;
justify-content: center;
background-color: #38b6ff;
color: #fff;
border-radius: 5px;
}
}
......
base-manager-ui/admin/src/pages/basicset/surface/components/RightPreview.vue
View file @ dc485f79
......@@ -155,7 +155,7 @@ export default {
<style lang="less" scoped>
.right-preview {
height: 80vh;
height: 100%;
display: flex;
flex-direction: column;
padding: 15px 0px;
......@@ -170,7 +170,7 @@ export default {
padding: 0px 15px;
display: flex;
flex-direction: column;
border-bottom: 1px solid #ccc;
// border-bottom: 1px solid #ccc;
overflow-y: auto;
.preview-item {
margin-bottom: 6px;
......
base-manager-ui/admin/src/pages/basicset/surface/surface.vue
View file @ dc485f79
<template>
<div class="surface">
<div class="container">
<a-card title="皮肤管理" :bordered="false">
<div slot="extra">
<TabHeader label="皮肤管理">
<a-space>
<a-button v-permission="[1]" icon="plus" @click="addDev"
>新增设备</a-button
......@@ -14,7 +13,7 @@
>新增皮肤模板</a-button
>
</a-space>
</div>
</TabHeader>
<div class="main">
<div class="menu-box">
<LeftMenu
......@@ -35,7 +34,6 @@
></RightPreview>
</div>
</div>
</a-card>
<!-- 编辑分类弹窗 -->
<EditClassify
:visible.sync="visible"
......@@ -64,6 +62,7 @@ import RightPreview from "./components/RightPreview.vue";
import EditClassify from "./modal/EditClassify.vue";
import AddSurface from "./modal/AddSurface.vue";
import AddDev from "./modal/AddDev.vue";
import TabHeader from "@/components/TabHeader";
export default {
components: {
LeftMenu,
......@@ -72,6 +71,7 @@ export default {
EditClassify,
AddSurface,
AddDev,
TabHeader,
},
data() {
return {
......@@ -141,8 +141,7 @@ export default {
<style lang="less" scoped>
.surface {
width: 100%;
height: auto;
background-color: #fff;
height: 100%;
.container {
width: 100%;
height: 100%;
......
base-manager-ui/admin/src/pages/basicset/system/System.vue
View file @ dc485f79
<template>
<div class="system flex flexc">
<a-tabs :activeKey="activeKey" @change="changeRouter">
<a-tab-pane key="/system/parameter" tab="系统参数"> </a-tab-pane>
<a-tab-pane key="/system/task" tab="任务信息"> </a-tab-pane>
<a-tab-pane key="/system/systemlogs" tab="操作日志"> </a-tab-pane>
<a-tab-pane key="/system/parameter">
<span slot="tab">
<a-icon type="container" />
系统参数
</span>
</a-tab-pane>
<a-tab-pane key="/system/task">
<span slot="tab">
<a-icon type="compass" />
任务信息
</span>
</a-tab-pane>
<a-tab-pane key="/system/systemlogs">
<span slot="tab">
<a-icon type="cloud-server" />
操作日志
</span>
</a-tab-pane>
</a-tabs>
<div class="system-out-box flex1">
<router-view></router-view>
......
base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
View file @ dc485f79
<template>
<a-spin tip="正在上传中..." :spinning="spinning">
<div class="website">
<!-- 右边 -->
<div class="right ff">
<!-- <div class="person_message">工作人员管理</div> -->
<div class="person_chang">
<div class="website flex flexc">
<TabHeader label="工作人员管理"></TabHeader>
<div class="pd15 flex1 auto-scroll-y">
<div class="person_chang flex aic mb10">
<div class="person_gruop">选择部门：</div>
<div class="person_gruop1">
<div class="dept-select flex aic">
......@@ -63,7 +62,7 @@
</a-radio-group> -->
</div>
</div>
<div class="person_chang">
<div class="person_chang flex aic">
<div class="person_window">选择窗口：</div>
<div class="person_window1">
<div class="dept-select flex aic">
......@@ -112,7 +111,6 @@
<a-icon type="double-right" />
</div>
</a-popover>
</div>
<!-- <a-radio-group
button-style="solid"
v-model="windowSearch"
......@@ -125,6 +123,7 @@
</a-radio-group> -->
</div>
</div>
</div>
<div class="on btn pdr6">
<div>
<a-button type="primary" @click="showModal">新增人员</a-button>
......@@ -205,7 +204,7 @@
onShowSizeChange: showSizeChange,
}"
bordered
:scroll="{ y: 530 }"
:scroll="{ y: 510 }"
:loading="loading"
:columns="columns"
:data-source="WorkmanData"
......@@ -297,6 +296,7 @@
import addpersonnel from "./components/addpersonnel.vue";
import EditPwd from "./components/EditPwd";
import EditPersonel from "./components/EditPersonel.vue";
import TabHeader from "@/components/TabHeader";
import local from "@/utils/local";
import { Empty } from "ant-design-vue";
import { pageSizeOptions } from "@/config/pageConfig.js";
......@@ -386,6 +386,7 @@ export default {
addpersonnel,
EditPwd,
EditPersonel,
TabHeader,
},
data() {
return {
......@@ -656,12 +657,12 @@ export default {
<style lang="less" scoped>
.website {
width: 100%;
height: 100%;
.right {
width: 100%;
padding-right: 20px;
padding-top: 10px;
height: 100%;
color: #333;
padding-left: 20px;
.person_message {
font-size: 18px;
}
......@@ -681,9 +682,6 @@ export default {
}
}
.person_chang {
width: 100%;
margin-top: 15px;
display: flex;
.ant-radio-button-wrapper {
margin-bottom: 6px;
}
......
base-manager-ui/admin/src/router/config.js
View file @ dc485f79
......@@ -40,14 +40,6 @@ const options = {
},
component: () => import("@/pages/basicset/site/website"),
},
{
path: "deploy",
name: "部署模块管理",
meta: {
icon: "appstore",
},
component: () => import("@/pages/basicset/deploy/deploy"),
},
{
path: "business",
meta: {
......@@ -125,7 +117,6 @@ const options = {
},
],
},
{
path: "department",
meta: {
......@@ -135,7 +126,7 @@ const options = {
children: [
{
path: "",
name: "部门窗口管理",
name: "部门及窗口管理",
component: () => import("@/pages/basicset/dept/department"),
meta: { invisible: true, keepAlive: true },
},
......@@ -149,6 +140,31 @@ const options = {
},
],
},
{
path: "personnel",
name: "工作人员管理",
meta: {
icon: "idcard",
},
component: () => import("@/pages/basicset/workman/personnel"),
},
{
path: "festival",
name: "节假日管理",
meta: {
icon: "carry-out",
},
component: () => import("@/pages/basicset/holiday/festival"),
},
{
path: "deploy",
name: "部署模块管理",
meta: {
icon: "appstore",
},
component: () => import("@/pages/basicset/deploy/deploy"),
},
{
path: "hall",
name: "大厅管理",
......@@ -178,14 +194,7 @@ const options = {
},
],
},
{
path: "personnel",
name: "工作人员管理",
meta: {
icon: "idcard",
},
component: () => import("@/pages/basicset/workman/personnel"),
},
{
path: "surface",
component: () => import("@/pages/basicset/surface/index"),
......@@ -216,14 +225,7 @@ const options = {
},
component: () => import("@/pages/basicset/sms/configurat"),
},
{
path: "festival",
name: "节假日配置",
meta: {
icon: "carry-out",
},
component: () => import("@/pages/basicset/holiday/festival"),
},
{
path: "appmarket",
component: () => import("@/pages/basicset/appmarket/Index"),
......
base-manager-ui/admin/src/store/modules/site.js
View file @ dc485f79
export default {
namespaced: true,
state: {
path: "", // 门户跳转过来的路由
sysName: "", // 系统名称
sysLogo: "", // 系统logo
siteId: "", // 站点id
......@@ -40,6 +41,9 @@ export default {
},
},
mutations: {
SET_path(state, path) {
state.path = path;
},
SET_sysName(state, sysName) {
state.sysName = sysName;
},
......
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