Skip to content

A
agent-platform
Commit 71ee3156 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b855a219 1adadc44
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 467 deletions
base-manager-ui/admin/src/layouts/Layouts.vue
View file @ 71ee3156
...@@ -16,15 +16,15 @@ ...@@ -16,15 +16,15 @@
</div> </div>
<div> <div>
<a-space size="middle"> <a-space size="middle">
<a v-permission="[1]" @click="visibleInit = true"> <!-- <a v-permission="[1]" @click="visibleInit = true">
<a-icon type="redo" /> <a-icon type="redo" />
初始化区域数据 初始化区域数据
</a> </a> -->
<a-tooltip class="header-item" title="返回门户" placement="bottom"> <!-- <a-tooltip class="header-item" title="返回门户" placement="bottom">
<a :href="portalUrl + (path ? path : '')"> <a :href="portalUrl + (path ? path : '')">
<a-icon type="home" /> 返回门户 <a-icon type="home" /> 返回门户
</a> </a>
</a-tooltip> </a-tooltip> -->
</a-space> </a-space>
</div> </div>
</a-layout-header> </a-layout-header>
......
base-manager-ui/admin/src/pages/basicset/addmatter/components/AddSynopsis.vue
View file @ 71ee3156
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<a-input v-model="baseform.sort" placeholder="请输入序号" /> <a-input v-model="baseform.sort" placeholder="请输入序号" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="8"> <!-- <a-col :span="8">
<a-form-model-item label="所属部门" prop="deptCode"> <a-form-model-item label="所属部门" prop="deptCode">
<a-select <a-select
showSearch showSearch
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
> >
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col> -->
<a-col :span="8"> <a-col :span="8">
<a-form-model-item label="是否收费" prop="isChargesShow"> <a-form-model-item label="是否收费" prop="isChargesShow">
<a-radio-group v-model="baseform.isChargesShow"> <a-radio-group v-model="baseform.isChargesShow">
......
base-manager-ui/admin/src/pages/basicset/addmatter/components/baseMessage.vue
View file @ 71ee3156
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="8"> <!-- <a-col :span="8">
<a-form-model-item label="所属部门" prop="deptCode"> <a-form-model-item label="所属部门" prop="deptCode">
<a-select <a-select
showSearch showSearch
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
> >
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col> -->
<a-col :span="8"> <a-col :span="8">
<a-form-model-item label="服务对象" prop="appoveObjectShow"> <a-form-model-item label="服务对象" prop="appoveObjectShow">
......
base-manager-ui/admin/src/pages/basicset/business/business.vue
View file @ 71ee3156
<template> <template>
<div class="business flex flexc"> <div class="business flex flexc">
<a-tabs :activeKey="active" @change="changeRouter"> <a-tabs :activeKey="active" @change="changeRouter">
<a-tab-pane key="/business/businessmanage">
<span slot="tab">
<a-icon type="container" />
业务管理
</span>
</a-tab-pane>
<a-tab-pane key="/business/mattermanage"> <a-tab-pane key="/business/mattermanage">
<span slot="tab"> <span slot="tab">
<a-icon type="read" /> <a-icon type="read" />
事项管理 事项管理
</span> </span>
</a-tab-pane> </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">
<span slot="tab">
<a-icon type="apartment" />
办事指南数据管理
</span>
</a-tab-pane>
</a-tabs> </a-tabs>
<div class="business-out-box flex1"> <div class="business-out-box flex1">
<router-view></router-view> <router-view></router-view>
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue
View file @ 71ee3156
<template> <template>
<div class="basicset-tab2"> <div class="basicset-tab2">
<div class="left">
<div class="header">
<div class="titel">站点事项列表</div>
<div class="header-bottom pdr6">
<div class="left-btn">
<a-button type="danger" @click="handleDelAll"> 批量移除 </a-button>
</div>
<div>
<a-space>
<a-select
style="width: 120px"
v-model="leftSource"
class="select-department"
placeholder="全部来源"
:allowClear="true"
>
<a-select-option :value="0"> 一体化添加 </a-select-option>
<a-select-option :value="1"> 手动添加 </a-select-option>
</a-select>
<a-select
showSearch
style="min-width: 120px"
v-model="leftDept"
class="select-department"
placeholder="全部部门"
optionFilterProp="label"
:allowClear="true"
>
<a-select-option
v-for="v in deptList"
:key="v.id"
:value="v.deptNumber"
:label="v.name"
>
{{ v.name }}
</a-select-option>
</a-select>
<a-input-search
v-model="searchLeftVal"
placeholder="请输入事项名称搜索"
enter-button="搜索"
@search="onSearchLeft"
allowClear
/>
</a-space>
</div>
</div>
</div>
<div class="table-content">
<!-- 表格 -->
<a-table
bordered
size="middle"
:loading="leftLoading"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: leftCurrent,
total: leftTotal,
pageSize: leftSize,
showSizeChanger: true,
showQuickJumper: true,
defaultPageSize: leftSize,
pageSizeOptions: pageSizeOptions,
onChange: changeLeft,
onShowSizeChange: showSizeChange,
}"
:scroll="{ y: 550 }"
:columns="leftColumns"
:data-source="matterSiteData"
:row-selection="{ onChange: onSelectChange }"
:rowKey="(record) => record.id"
>
<template slot="index" slot-scope="text, record, index">
<span>
{{ (leftCurrent - 1) * leftSize + index + 1 }}
</span>
</template>
<!-- 部门 -->
<template slot="deptName" slot-scope="text">
{{ text.deptName ? text.deptName : "--" }}
</template>
<!-- 事项名称 -->
<template slot="matterName" slot-scope="text">
<a-tooltip placement="topLeft">
<template slot="title">
{{ text.matterName }}
</template>
<div class="matter-name">{{ text.matterName }}</div>
</a-tooltip>
<a-tag v-if="text.source == 0" color="green"> 一体化添加 </a-tag>
<a-tag v-else color="blue"> 手动添加 </a-tag>
</template>
<!-- 到现场次数 -->
<template slot="num" slot-scope="text">
<span v-if="text.windowToTheSceneNum">{{
text.windowToTheSceneNum
}}</span>
<span v-else-if="text.onlineToTheSceneNum">{{
text.onlineToTheSceneNum
}}</span>
<span v-else>0</span>
</template>
<!-- 操作 -->
<template slot="action" slot-scope="text">
<a-space>
<span
href="javascript:;"
v-if="text.source == 1"
class="primary pointer"
@click="handleSiteEdit(text)"
>编辑</span
>
<span href="javascript:;" style="visibility: hidden" v-else
>编辑</span
>
<span
href="javascript:;"
class="delete pointer"
@click="handleDel(text.id, text)"
>移除</span
>
</a-space>
</template>
</a-table>
</div>
</div>
<!-- 右 --> <!-- 右 -->
<div class="right"> <div class="right">
<div class="header"> <div class="header">
...@@ -133,9 +7,9 @@ ...@@ -133,9 +7,9 @@
<div class="control pdr6"> <div class="control pdr6">
<div> <div>
<a-space size="middle"> <a-space size="middle">
<a-button type="primary" @click="handleAddAll"> <!-- <a-button type="primary" @click="handleAddAll">
批量加入 批量加入
</a-button> </a-button> -->
<a-button type="primary" @click="addMatter"> 新增事项 </a-button> <a-button type="primary" @click="addMatter"> 新增事项 </a-button>
</a-space> </a-space>
</div> </div>
...@@ -151,7 +25,7 @@ ...@@ -151,7 +25,7 @@
<a-select-option :value="0"> 一体化事项 </a-select-option> <a-select-option :value="0"> 一体化事项 </a-select-option>
<a-select-option :value="1"> 自建事项 </a-select-option> <a-select-option :value="1"> 自建事项 </a-select-option>
</a-select> </a-select>
<a-select <!-- <a-select
showSearch showSearch
allowClear allowClear
style="min-width: 120px" style="min-width: 120px"
...@@ -168,7 +42,7 @@ ...@@ -168,7 +42,7 @@
> >
{{ v.name }} {{ v.name }}
</a-select-option> </a-select-option>
</a-select> </a-select> -->
<a-input-search <a-input-search
v-model="searchRightVal" v-model="searchRightVal"
placeholder="请输入事项名称搜索" placeholder="请输入事项名称搜索"
...@@ -239,9 +113,9 @@ ...@@ -239,9 +113,9 @@
<span href="javascript:;" style="visibility: hidden" v-else <span href="javascript:;" style="visibility: hidden" v-else
>编辑</span >编辑</span
> >
<a href="javascript:;" class="primary" @click="handleIn(text.id)" <!-- <a href="javascript:;" class="primary" @click="handleIn(text.id)"
>加入</a >加入</a
> > -->
<span <span
href="javascript:;" href="javascript:;"
class="delete pointer" class="delete pointer"
...@@ -655,18 +529,18 @@ export default { ...@@ -655,18 +529,18 @@ export default {
.basicset-tab2 { .basicset-tab2 {
width: 100%; width: 100%;
display: flex; display: flex;
&::after { // &::after {
content: ""; // content: "";
width: 1px; // width: 1px;
height: 82vh; // height: 82vh;
position: absolute; // position: absolute;
background-color: #eeeeee; // background-color: #eeeeee;
top: 44px; // top: 44px;
left: 50%; // left: 50%;
} // }
.left, .left,
.right { .right {
width: 50%; width: 100%;
padding: 0 20px; padding: 0 20px;
.header { .header {
height: 100px; height: 100px;
......
base-manager-ui/admin/src/pages/login/Login.vue
View file @ 71ee3156
...@@ -29,6 +29,7 @@ export default { ...@@ -29,6 +29,7 @@ export default {
id: loginRes.data.id, id: loginRes.data.id,
userType: loginRes.data.userType, userType: loginRes.data.userType,
currUserName: loginRes.data.currUserName, currUserName: loginRes.data.currUserName,
name: loginRes.data.currUserName,
}; };
this.getToken(token, userInfo, loginRes.data); this.getToken(token, userInfo, loginRes.data);
this.$message.success(loginRes.msg, 3); this.$message.success(loginRes.msg, 3);
...@@ -57,16 +58,16 @@ export default { ...@@ -57,16 +58,16 @@ export default {
this.SET_token(token); this.SET_token(token);
console.log(data); console.log(data);
// data.siteid ? this.SET_SITE_ID(data.siteid) : ""; this.SET_SITE_ID("1");
// data.siteName ? this.SET_siteName(data.siteName) : ""; // data.siteName ? this.SET_siteName(data.siteName) : "";
// this.SET_sysName(data.sysName); // this.SET_sysName(data.sysName);
// this.SET_sysLogo(data.sysLogo); // this.SET_sysLogo(data.sysLogo);
// this.SET_path(data.path); // this.SET_path(data.path);
// local.setLocal("siteId", data.siteid); local.setLocal("siteId", "1");
// local.setLocal("siteName", data.siteName); // local.setLocal("siteName", data.siteName);
// 动态菜单 // 动态菜单
createMenus(); createMenus();
this.$router.push("/website"); this.$router.push("/");
} else { } else {
this.$message.warning("跳转失败,请重新登录"); this.$message.warning("跳转失败,请重新登录");
setTimeout(() => { setTimeout(() => {
......
base-manager-ui/admin/src/router/config.js
View file @ 71ee3156
...@@ -15,16 +15,8 @@ const options = { ...@@ -15,16 +15,8 @@ const options = {
path: "/", path: "/",
name: "首页", name: "首页",
component: Layouts, component: Layouts,
redirect: "/website", redirect: "/business/mattermanage",
children: [ children: [
{
path: "/website",
name: "站点管理",
meta: {
icon: "bank",
},
component: () => import("@/pages/basicset/site/website"),
},
{ {
path: "/business", path: "/business",
meta: { meta: {
...@@ -43,16 +35,16 @@ const options = { ...@@ -43,16 +35,16 @@ const options = {
redirect: "/business/businessmanage", redirect: "/business/businessmanage",
children: [ children: [
// 业务管理 // 业务管理
{ // {
path: "businessmanage", // path: "businessmanage",
meta: { // meta: {
invisible: true, // invisible: true,
}, // },
component: () => // component: () =>
import( // import(
"@/pages/basicset/business/components/businessTabs1" // "@/pages/basicset/business/components/businessTabs1"
), // ),
}, // },
// 事项管理 // 事项管理
{ {
path: "mattermanage", path: "mattermanage",
...@@ -65,27 +57,27 @@ const options = { ...@@ -65,27 +57,27 @@ const options = {
), ),
}, },
// 业务事项关联 // 业务事项关联
{ // {
path: "businessinmanage", // path: "businessinmanage",
meta: { // meta: {
invisible: true, // invisible: true,
}, // },
component: () => // component: () =>
import( // import(
"@/pages/basicset/business/components/businessTabs3" // "@/pages/basicset/business/components/businessTabs3"
), // ),
}, // },
// 办事指南事项管理 // // 办事指南事项管理
{ // {
path: "workguide", // path: "workguide",
meta: { // meta: {
invisible: true, // invisible: true,
}, // },
component: () => // component: () =>
import( // import(
"@/pages/basicset/business/components/businessTabs4" // "@/pages/basicset/business/components/businessTabs4"
), // ),
}, // },
], ],
}, },
{ {
...@@ -101,261 +93,7 @@ const options = { ...@@ -101,261 +93,7 @@ const options = {
meta: { invisible: true }, meta: { invisible: true },
}, },
], ],
}, }
{
path: "/department",
meta: {
icon: "audit",
},
component: () => import("@/pages/basicset/dept/Index"),
children: [
{
path: "",
name: "部门及窗口管理",
component: () => import("@/pages/basicset/dept/department"),
meta: { invisible: true, keepAlive: true },
},
{
path: "adddepartment",
name: "新增窗口事项",
meta: {
invisible: true,
},
component: () => import("@/pages/basicset/dept/addWindowMatter"),
},
],
},
{
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",
roles: ["admin"],
},
component: () => import("@/pages/basicset/deploy/deploy"),
},
{
path: "/hall",
name: "大厅管理",
meta: {
icon: "gateway",
},
component: () => import("@/pages/basicset/hall/Hall"),
redirect: "/hall/hallmanage",
children: [
{
path: "hallmanage",
name: "",
component: () =>
import("@/pages/basicset/hall/hallmanage/HallManage.vue"),
meta: {
invisible: true,
},
},
{
path: "hallwindow",
name: "大厅窗口管理",
meta: {
invisible: true,
},
component: () =>
import("@/pages/basicset/hall/hallwindow/HallWindow.vue"),
},
],
},
{
path: "/surface",
component: () => import("@/pages/basicset/surface/index"),
meta: {
icon: "skin",
},
children: [
{
path: "",
name: "皮肤管理",
component: () => import("@/pages/basicset/surface/surface"),
meta: { invisible: true },
},
{
path: "addsurfacetemplate",
name: "新增皮肤模板",
component: () =>
import("@/pages/basicset/surface/AddSurfaceTemplate"),
meta: { invisible: true },
},
],
},
{
path: "/configurat",
name: "短信配置",
meta: {
icon: "mail",
},
component: () => import("@/pages/basicset/sms/configurat"),
},
{
path: "/appmarket",
component: () => import("@/pages/basicset/appmarket/Index"),
meta: {
icon: "shop",
},
children: [
{
path: "",
name: "应用集市",
component: () => import("@/pages/basicset/appmarket/AppMarket"),
meta: { invisible: true },
redirect: "/appmarket/terminalapp",
children: [
{
path: "terminalapp",
component: () =>
import("@/pages/basicset/appmarket/components/TerminalApp"),
meta: {
invisible: true,
// keepAlive: true,
},
},
{
path: "moveapp",
component: () =>
import("@/pages/basicset/appmarket/components/MoveApp"),
meta: {
invisible: true,
// keepAlive: true,
},
},
{
path: "blackapp",
component: () =>
import("@/pages/basicset/appmarket/components/BlackApp"),
meta: {
invisible: true,
},
},
{
path: "appTheme",
component: () =>
import("@/pages/basicset/appmarket/components/AppTheme"),
meta: {
invisible: true,
},
},
],
},
{
path: "appdetails",
name: "应用详情",
component: () => import("@/pages/basicset/appmarket/AppDetails"),
meta: { invisible: true },
redirect: "/appmarket/appdetails/appdetailspage",
children: [
{
path: "appdetailspage",
component: () =>
import(
"@/pages/basicset/appmarket/components/AppDetailsPage"
),
meta: {
invisible: true,
},
},
{
path: "dataupdate",
component: () =>
import("@/pages/basicset/appmarket/components/DataUpdate"),
meta: {
invisible: true,
},
},
{
path: "fieldconfig",
component: () =>
import("@/pages/basicset/appmarket/components/FieldConfig"),
meta: {
invisible: true,
},
},
],
},
],
},
{
path: "/system",
name: "系统设置",
component: () => import("@/pages/basicset/system/System"),
meta: {
icon: "global",
},
redirect: "system/parameter",
children: [
{
path: "user",
name: "用户管理",
component: () => import("@/pages/basicset/system/user/User"),
meta: { invisible: true },
},
{
path: "role",
name: "角色管理",
component: () => import("@/pages/basicset/system/role/Role"),
meta: { invisible: true },
},
{
path: "resource",
name: "资源管理",
component: () =>
import("@/pages/basicset/system/resourceManage/Resource"),
meta: { invisible: true },
},
{
path: "dimension",
name: "维度管理",
component: () =>
import("@/pages/basicset/system/dimension/Dimension"),
meta: { invisible: true },
},
{
path: "parameter",
name: "系统参数",
component: () =>
import("@/pages/basicset/system/parameter/Parameter"),
meta: { invisible: true },
},
{
path: "task",
name: "任务信息",
component: () => import("@/pages/basicset/system/task/TaskSet"),
meta: { invisible: true },
},
{
path: "systemlogs",
name: "操作日志",
component: () =>
import("@/pages/basicset/system/systemlogs/SystemLogs"),
meta: { invisible: true },
},
],
},
], ],
}, },
], ],
......
base-manager-ui/admin/src/router/index.js
View file @ 71ee3156
...@@ -39,7 +39,7 @@ const routes = [ ...@@ -39,7 +39,7 @@ const routes = [
path: "/", path: "/",
name: "首页", name: "首页",
component: Layouts, component: Layouts,
redirect: "/website", redirect: "/business/mattermanage",
children: [ children: [
{ {
path: "/website", path: "/website",
...@@ -441,6 +441,7 @@ function createMenus() { ...@@ -441,6 +441,7 @@ function createMenus() {
let options = initRouter(); let options = initRouter();
let routesArr = calcRouters(options.routes, role); let routesArr = calcRouters(options.routes, role);
const rootRoute = routesArr.find((item) => item.path === "/"); const rootRoute = routesArr.find((item) => item.path === "/");
console.log(rootRoute,"!!!!!!!!");
const menuRoutes = rootRoute && rootRoute.children; const menuRoutes = rootRoute && rootRoute.children;
mergeI18nFromRoutes(i18n, menuRoutes); mergeI18nFromRoutes(i18n, menuRoutes);
if (menuRoutes) { if (menuRoutes) {
......
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