Skip to content

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

Merge remote-tracking branch 'origin/master'

parents b855a219 1adadc44
Expand all 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 @@
</div>
<div>
<a-space size="middle">
<a v-permission="[1]" @click="visibleInit = true">
<!-- <a v-permission="[1]" @click="visibleInit = true">
<a-icon type="redo" />
初始化区域数据
</a>
<a-tooltip class="header-item" title="返回门户" placement="bottom">
</a> -->
<!-- <a-tooltip class="header-item" title="返回门户" placement="bottom">
<a :href="portalUrl + (path ? path : '')">
<a-icon type="home" /> 返回门户
</a>
</a-tooltip>
</a-tooltip> -->
</a-space>
</div>
</a-layout-header>
......
base-manager-ui/admin/src/pages/basicset/addmatter/components/AddSynopsis.vue
View file @ 71ee3156
......@@ -42,7 +42,7 @@
<a-input v-model="baseform.sort" placeholder="请输入序号" />
</a-form-model-item>
</a-col>
<a-col :span="8">
<!-- <a-col :span="8">
<a-form-model-item label="所属部门" prop="deptCode">
<a-select
showSearch
......@@ -62,7 +62,7 @@
>
</a-select>
</a-form-model-item>
</a-col>
</a-col> -->
<a-col :span="8">
<a-form-model-item label="是否收费" prop="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 @@
</a-form-model-item>
</a-col>
<a-col :span="8">
<!-- <a-col :span="8">
<a-form-model-item label="所属部门" prop="deptCode">
<a-select
showSearch
......@@ -63,7 +63,7 @@
>
</a-select>
</a-form-model-item>
</a-col>
</a-col> -->
<a-col :span="8">
<a-form-model-item label="服务对象" prop="appoveObjectShow">
......
base-manager-ui/admin/src/pages/basicset/business/business.vue
View file @ 71ee3156
<template>
<div class="business flex flexc">
<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">
<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">
<span slot="tab">
<a-icon type="apartment" />
办事指南数据管理
</span>
</a-tab-pane>
</a-tabs>
<div class="business-out-box flex1">
<router-view></router-view>
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue
View file @ 71ee3156
<template>
<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="header">
......@@ -133,9 +7,9 @@
<div class="control pdr6">
<div>
<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-space>
</div>
......@@ -151,7 +25,7 @@
<a-select-option :value="0"> 一体化事项 </a-select-option>
<a-select-option :value="1"> 自建事项 </a-select-option>
</a-select>
<a-select
<!-- <a-select
showSearch
allowClear
style="min-width: 120px"
......@@ -168,7 +42,7 @@
>
{{ v.name }}
</a-select-option>
</a-select>
</a-select> -->
<a-input-search
v-model="searchRightVal"
placeholder="请输入事项名称搜索"
......@@ -239,9 +113,9 @@
<span href="javascript:;" style="visibility: hidden" v-else
>编辑</span
>
<a href="javascript:;" class="primary" @click="handleIn(text.id)"
<!-- <a href="javascript:;" class="primary" @click="handleIn(text.id)"
>加入</a
>
> -->
<span
href="javascript:;"
class="delete pointer"
......@@ -655,18 +529,18 @@ export default {
.basicset-tab2 {
width: 100%;
display: flex;
&::after {
content: "";
width: 1px;
height: 82vh;
position: absolute;
background-color: #eeeeee;
top: 44px;
left: 50%;
}
// &::after {
// content: "";
// width: 1px;
// height: 82vh;
// position: absolute;
// background-color: #eeeeee;
// top: 44px;
// left: 50%;
// }
.left,
.right {
width: 50%;
width: 100%;
padding: 0 20px;
.header {
height: 100px;
......
base-manager-ui/admin/src/pages/login/Login.vue
View file @ 71ee3156
......@@ -29,6 +29,7 @@ export default {
id: loginRes.data.id,
userType: loginRes.data.userType,
currUserName: loginRes.data.currUserName,
name: loginRes.data.currUserName,
};
this.getToken(token, userInfo, loginRes.data);
this.$message.success(loginRes.msg, 3);
......@@ -57,16 +58,16 @@ export default {
this.SET_token(token);
console.log(data);
// data.siteid ? this.SET_SITE_ID(data.siteid) : "";
this.SET_SITE_ID("1");
// data.siteName ? this.SET_siteName(data.siteName) : "";
// this.SET_sysName(data.sysName);
// this.SET_sysLogo(data.sysLogo);
// this.SET_path(data.path);
// local.setLocal("siteId", data.siteid);
local.setLocal("siteId", "1");
// local.setLocal("siteName", data.siteName);
// 动态菜单
createMenus();
this.$router.push("/website");
this.$router.push("/");
} else {
this.$message.warning("跳转失败,请重新登录");
setTimeout(() => {
......
base-manager-ui/admin/src/router/config.js
View file @ 71ee3156
This diff is collapsed.
base-manager-ui/admin/src/router/index.js
View file @ 71ee3156
......@@ -39,7 +39,7 @@ const routes = [
path: "/",
name: "首页",
component: Layouts,
redirect: "/website",
redirect: "/business/mattermanage",
children: [
{
path: "/website",
......@@ -441,6 +441,7 @@ function createMenus() {
let options = initRouter();
let routesArr = calcRouters(options.routes, role);
const rootRoute = routesArr.find((item) => item.path === "/");
console.log(rootRoute,"!!!!!!!!");
const menuRoutes = rootRoute && rootRoute.children;
mergeI18nFromRoutes(i18n, 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