Skip to content

R
rongtong-pc
Commit 89fba505 authored by p-wanping.song's avatar p-wanping.song
Browse files
Options

Merge branch 'swp-develop' into develop

parents 6dddf2eb 5c5ca2e0
Hide whitespace changes
Inline Side-by-side
Showing with 294 additions and 248 deletions
src/assets/home/4.png 0 → 100644
View file @ 89fba505
This diff is collapsed.
src/plugins/auth.js
View file @ 89fba505
import store from '@/store' import store from "@/store";
function authPermission(permission) { function authPermission(permission) {
const all_permission = "*:*:*"; const all_permission = "*:*:*";
const permissions = store.getters && store.getters.permissions const permissions = store.getters && store.getters.permissions;
if (permission && permission.length > 0) { if (permission && permission.length > 0) {
return permissions.some(v => { return permissions.some((v) => {
return all_permission === v || v === permission return all_permission === v || v === permission;
}) });
} else { } else {
return false return false;
} }
} }
function authRole(role) { function authRole(role) {
const super_admin = "admin"; const super_admin = "admin";
const roles = store.getters && store.getters.roles const roles = store.getters && store.getters.roles;
if (role && role.length > 0) { if (role && role.length > 0) {
return roles.some(v => { return roles.some((v) => {
return super_admin === v || v === role return super_admin === v || v === role;
}) });
} else { } else {
return false return false;
} }
} }
...@@ -31,15 +31,15 @@ export default { ...@@ -31,15 +31,15 @@ export default {
}, },
// 验证用户是否含有指定权限，只需包含其中一个 // 验证用户是否含有指定权限，只需包含其中一个
hasPermiOr(permissions) { hasPermiOr(permissions) {
return permissions.some(item => { return permissions.some((item) => {
return authPermission(item) return authPermission(item);
}) });
}, },
// 验证用户是否含有指定权限，必须全部拥有 // 验证用户是否含有指定权限，必须全部拥有
hasPermiAnd(permissions) { hasPermiAnd(permissions) {
return permissions.every(item => { return permissions.every((item) => {
return authPermission(item) return authPermission(item);
}) });
}, },
// 验证用户是否具备某角色 // 验证用户是否具备某角色
hasRole(role) { hasRole(role) {
...@@ -47,14 +47,14 @@ export default { ...@@ -47,14 +47,14 @@ export default {
}, },
// 验证用户是否含有指定角色，只需包含其中一个 // 验证用户是否含有指定角色，只需包含其中一个
hasRoleOr(roles) { hasRoleOr(roles) {
return roles.some(item => { return roles.some((item) => {
return authRole(item) return authRole(item);
}) });
}, },
// 验证用户是否含有指定角色，必须全部拥有 // 验证用户是否含有指定角色，必须全部拥有
hasRoleAnd(roles) { hasRoleAnd(roles) {
return roles.every(item => { return roles.every((item) => {
return authRole(item) return authRole(item);
}) });
} },
} };
src/router/index.js
View file @ 89fba505
import Vue from 'vue' import Vue from "vue";
import Router from 'vue-router' import Router from "vue-router";
Vue.use(Router) Vue.use(Router);
/* Layout */ /* Layout */
import Layout from '@/layout' import Layout from "@/layout";
/** /**
* Note: 路由配置项 * Note: 路由配置项
...@@ -31,223 +31,223 @@ import Layout from '@/layout' ...@@ -31,223 +31,223 @@ import Layout from '@/layout'
// 公共路由 // 公共路由
export const constantRoutes = [ export const constantRoutes = [
{ {
path: '/redirect', path: "/redirect",
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [ children: [
{ {
path: '/redirect/:path(.*)', path: "/redirect/:path(.*)",
component: () => import('@/views/redirect') component: () => import("@/views/redirect"),
} },
] ],
}, },
{ {
path: '/login', path: "/login",
component: () => import('@/views/login'), component: () => import("@/views/login"),
hidden: true hidden: true,
}, },
{ {
path: '/register', path: "/register",
component: () => import('@/views/register'), component: () => import("@/views/register"),
hidden: true hidden: true,
}, },
{ {
path: '/404', path: "/404",
component: () => import('@/views/error/404'), component: () => import("@/views/error/404"),
hidden: true hidden: true,
}, },
{ {
path: '/401', path: "/401",
component: () => import('@/views/error/401'), component: () => import("@/views/error/401"),
hidden: true hidden: true,
}, },
{ {
path: '', path: "",
component: Layout, component: Layout,
redirect: 'index', redirect: "index",
children: [ children: [
{ {
path: 'index', path: "index",
component: () => import('@/views/index'), component: () => import("@/views/home"),
name: 'Index', name: "Index",
meta: { title: '风险态势分析图', icon: 'dashboard', affix: true } meta: { title: "首页", icon: "dashboard", affix: true },
} },
] ],
}, },
{ {
path: '/user', path: "/user",
component: Layout, component: Layout,
hidden: true, hidden: true,
redirect: 'noredirect', redirect: "noredirect",
children: [ children: [
{ {
path: 'profile', path: "profile",
component: () => import('@/views/system/user/profile/index'), component: () => import("@/views/system/user/profile/index"),
name: 'Profile', name: "Profile",
meta: { title: '个人中心', icon: 'user' } meta: { title: "个人中心", icon: "user" },
} },
] ],
} },
] ];
// 动态路由，基于用户权限动态去加载 // 动态路由，基于用户权限动态去加载
export const dynamicRoutes = [ export const dynamicRoutes = [
{ {
path: '/system/user-auth', path: "/system/user-auth",
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['system:user:edit'], permissions: ["system:user:edit"],
children: [ children: [
{ {
path: 'role/:userId(\\d+)', path: "role/:userId(\\d+)",
component: () => import('@/views/system/user/authRole'), component: () => import("@/views/system/user/authRole"),
name: 'AuthRole', name: "AuthRole",
meta: { title: '分配角色', activeMenu: '/system/user' } meta: { title: "分配角色", activeMenu: "/system/user" },
} },
] ],
}, },
{ {
path: '/system/role-auth', path: "/system/role-auth",
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['system:role:edit'], permissions: ["system:role:edit"],
children: [ children: [
{ {
path: 'user/:roleId(\\d+)', path: "user/:roleId(\\d+)",
component: () => import('@/views/system/role/authUser'), component: () => import("@/views/system/role/authUser"),
name: 'AuthUser', name: "AuthUser",
meta: { title: '分配用户', activeMenu: '/system/role' } meta: { title: "分配用户", activeMenu: "/system/role" },
} },
] ],
}, },
{ {
path: '/system/dict-data', path: "/system/dict-data",
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['system:dict:list'], permissions: ["system:dict:list"],
children: [ children: [
{ {
path: 'index/:dictId(\\d+)', path: "index/:dictId(\\d+)",
component: () => import('@/views/system/dict/data'), component: () => import("@/views/system/dict/data"),
name: 'Data', name: "Data",
meta: { title: '字典数据', activeMenu: '/system/dict' } meta: { title: "字典数据", activeMenu: "/system/dict" },
} },
] ],
}, },
{ {
path: '/system/evaluation-items', path: "/system/evaluation-items",
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['evaluation:items:list'], permissions: ["evaluation:items:list"],
children: [ children: [
{ {
path: 'index/:factorId(\\d+)', path: "index/:factorId(\\d+)",
component: () => import('@/views/evaluation/factor/items'), component: () => import("@/views/evaluation/factor/items"),
name: 'Data', name: "Data",
meta: { title: '因素数据', activeMenu: '/evaluation/factor' } meta: { title: "因素数据", activeMenu: "/evaluation/factor" },
} },
] ],
}, },
{ {
path: '/risk/plan/ledgerdata', path: "/risk/plan/ledgerdata",
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['system:dict:list'], permissions: ["system:dict:list"],
children: [ children: [
{ {
path: 'index/:id(\\d+)', path: "index/:id(\\d+)",
component: () => import('@/views/risk/plan/ledgerdata'), component: () => import("@/views/risk/plan/ledgerdata"),
name: 'ledgerdata', name: "ledgerdata",
meta: { title: '任务详情', activeMenu: '/risk/plan/ledgerdata' } meta: { title: "任务详情", activeMenu: "/risk/plan/ledgerdata" },
} },
] ],
}, },
{ {
path: '/risk/plan/inherentdata', path: "/risk/plan/inherentdata",
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['system:dict:list'], permissions: ["system:dict:list"],
children: [ children: [
{ {
path: 'index/:id(\\d+)', path: "index/:id(\\d+)",
component: () => import('@/views/risk/plan/inherentdata'), component: () => import("@/views/risk/plan/inherentdata"),
name: 'inherentdata', name: "inherentdata",
meta: { title: '固有风险详情', activeMenu: '/risk/plan/inherentdata' } meta: { title: "固有风险详情", activeMenu: "/risk/plan/inherentdata" },
} },
] ],
}, },
{ {
path: '/risk/plan/existingdata', path: "/risk/plan/existingdata",
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['system:dict:list'], permissions: ["system:dict:list"],
children: [ children: [
{ {
path: 'index/:id(\\d+)', path: "index/:id(\\d+)",
component: () => import('@/views/risk/plan/existingdata'), component: () => import("@/views/risk/plan/existingdata"),
name: 'existingdata', name: "existingdata",
meta: { title: '现状风险详情', activeMenu: '/risk/plan/existingdata' } meta: { title: "现状风险详情", activeMenu: "/risk/plan/existingdata" },
} },
] ],
}, },
{ {
path: '/risk/drawCanvas/index', path: "/risk/drawCanvas/index",
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['system:ledgerRoom:list'], permissions: ["system:ledgerRoom:list"],
children: [ children: [
{ {
path: 'index/:id(\\d+)', path: "index/:id(\\d+)",
component: () => import('@/views/risk/drawCanvas/index'), component: () => import("@/views/risk/drawCanvas/index"),
name: 'drawCanvas', name: "drawCanvas",
meta: { title: '四色图', activeMenu: '/risk/drawCanvas/index' } meta: { title: "四色图", activeMenu: "/risk/drawCanvas/index" },
} },
] ],
}, },
{ {
path: '/monitor/job-log', path: "/monitor/job-log",
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['monitor:job:list'], permissions: ["monitor:job:list"],
children: [ children: [
{ {
path: 'index/:jobId(\\d+)', path: "index/:jobId(\\d+)",
component: () => import('@/views/monitor/job/log'), component: () => import("@/views/monitor/job/log"),
name: 'JobLog', name: "JobLog",
meta: { title: '调度日志', activeMenu: '/monitor/job' } meta: { title: "调度日志", activeMenu: "/monitor/job" },
} },
] ],
}, },
{ {
path: '/tool/gen-edit', path: "/tool/gen-edit",
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['tool:gen:edit'], permissions: ["tool:gen:edit"],
children: [ children: [
{ {
path: 'index/:tableId(\\d+)', path: "index/:tableId(\\d+)",
component: () => import('@/views/tool/gen/editTable'), component: () => import("@/views/tool/gen/editTable"),
name: 'GenEdit', name: "GenEdit",
meta: { title: '修改生成配置', activeMenu: '/tool/gen' } meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
} },
] ],
} },
] ];
// 防止连续点击多次路由报错 // 防止连续点击多次路由报错
let routerPush = Router.prototype.push; let routerPush = Router.prototype.push;
let routerReplace = Router.prototype.replace; let routerReplace = Router.prototype.replace;
// push // push
Router.prototype.push = function push(location) { Router.prototype.push = function push(location) {
return routerPush.call(this, location).catch(err => err) return routerPush.call(this, location).catch((err) => err);
} };
// replace // replace
Router.prototype.replace = function push(location) { Router.prototype.replace = function push(location) {
return routerReplace.call(this, location).catch(err => err) return routerReplace.call(this, location).catch((err) => err);
} };
export default new Router({ export default new Router({
mode: 'history', // 去掉url中的# mode: "history", // 去掉url中的#
scrollBehavior: () => ({ y: 0 }), scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes routes: constantRoutes,
}) });
src/store/modules/permission.js
View file @ 89fba505
import auth from '@/plugins/auth' import auth from "@/plugins/auth";
import router, { constantRoutes, dynamicRoutes } from '@/router' import router, { constantRoutes, dynamicRoutes } from "@/router";
import { getRouters } from '@/api/menu' import { getRouters } from "@/api/menu";
import Layout from '@/layout/index' import Layout from "@/layout/index";
import ParentView from '@/components/ParentView' import ParentView from "@/components/ParentView";
import InnerLink from '@/layout/components/InnerLink' import InnerLink from "@/layout/components/InnerLink";
const permission = { const permission = {
state: { state: {
...@@ -11,123 +11,125 @@ const permission = { ...@@ -11,123 +11,125 @@ const permission = {
addRoutes: [], addRoutes: [],
defaultRoutes: [], defaultRoutes: [],
topbarRouters: [], topbarRouters: [],
sidebarRouters: [] sidebarRouters: [],
}, },
mutations: { mutations: {
SET_ROUTES: (state, routes) => { SET_ROUTES: (state, routes) => {
state.addRoutes = routes state.addRoutes = routes;
state.routes = constantRoutes.concat(routes) state.routes = constantRoutes.concat(routes);
}, },
SET_DEFAULT_ROUTES: (state, routes) => { SET_DEFAULT_ROUTES: (state, routes) => {
state.defaultRoutes = constantRoutes.concat(routes) state.defaultRoutes = constantRoutes.concat(routes);
}, },
SET_TOPBAR_ROUTES: (state, routes) => { SET_TOPBAR_ROUTES: (state, routes) => {
state.topbarRouters = routes state.topbarRouters = routes;
}, },
SET_SIDEBAR_ROUTERS: (state, routes) => { SET_SIDEBAR_ROUTERS: (state, routes) => {
state.sidebarRouters = routes state.sidebarRouters = routes;
}, },
}, },
actions: { actions: {
// 生成路由 // 生成路由
GenerateRoutes({ commit }) { GenerateRoutes({ commit }) {
return new Promise(resolve => { return new Promise((resolve) => {
// 向后端请求路由数据 // 向后端请求路由数据
getRouters().then(res => { getRouters().then((res) => {
const sdata = JSON.parse(JSON.stringify(res.data)) const sdata = JSON.parse(JSON.stringify(res.data));
const rdata = JSON.parse(JSON.stringify(res.data)) const rdata = JSON.parse(JSON.stringify(res.data));
const sidebarRoutes = filterAsyncRouter(sdata) const sidebarRoutes = filterAsyncRouter(sdata);
const rewriteRoutes = filterAsyncRouter(rdata, false, true) const rewriteRoutes = filterAsyncRouter(rdata, false, true);
debugger;
const asyncRoutes = filterDynamicRoutes(dynamicRoutes); const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) rewriteRoutes.push({ path: "*", redirect: "/404", hidden: true });
router.addRoutes(asyncRoutes); router.addRoutes(asyncRoutes);
commit('SET_ROUTES', rewriteRoutes) commit("SET_ROUTES", rewriteRoutes);
commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes)) commit("SET_SIDEBAR_ROUTERS", constantRoutes.concat(sidebarRoutes));
commit('SET_DEFAULT_ROUTES', sidebarRoutes) commit("SET_DEFAULT_ROUTES", sidebarRoutes);
commit('SET_TOPBAR_ROUTES', sidebarRoutes) commit("SET_TOPBAR_ROUTES", sidebarRoutes);
resolve(rewriteRoutes) resolve(rewriteRoutes);
}) });
}) });
} },
} },
} };
// 遍历后台传来的路由字符串，转换为组件对象 // 遍历后台传来的路由字符串，转换为组件对象
function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
return asyncRouterMap.filter(route => { return asyncRouterMap.filter((route) => {
if (type && route.children) { if (type && route.children) {
route.children = filterChildren(route.children) route.children = filterChildren(route.children);
} }
if (route.component) { if (route.component) {
// Layout ParentView 组件特殊处理 // Layout ParentView 组件特殊处理
if (route.component === 'Layout') { if (route.component === "Layout") {
route.component = Layout route.component = Layout;
} else if (route.component === 'ParentView') { } else if (route.component === "ParentView") {
route.component = ParentView route.component = ParentView;
} else if (route.component === 'InnerLink') { } else if (route.component === "InnerLink") {
route.component = InnerLink route.component = InnerLink;
} else { } else {
route.component = loadView(route.component) route.component = loadView(route.component);
} }
} }
if (route.children != null && route.children && route.children.length) { if (route.children != null && route.children && route.children.length) {
route.children = filterAsyncRouter(route.children, route, type) route.children = filterAsyncRouter(route.children, route, type);
} else { } else {
delete route['children'] delete route["children"];
delete route['redirect'] delete route["redirect"];
} }
return true return true;
}) });
} }
function filterChildren(childrenMap, lastRouter = false) { function filterChildren(childrenMap, lastRouter = false) {
var children = [] var children = [];
childrenMap.forEach((el, index) => { childrenMap.forEach((el, index) => {
if (el.children && el.children.length) { if (el.children && el.children.length) {
if (el.component === 'ParentView' && !lastRouter) { if (el.component === "ParentView" && !lastRouter) {
el.children.forEach(c => { el.children.forEach((c) => {
c.path = el.path + '/' + c.path c.path = el.path + "/" + c.path;
if (c.children && c.children.length) { if (c.children && c.children.length) {
children = children.concat(filterChildren(c.children, c)) children = children.concat(filterChildren(c.children, c));
return return;
} }
children.push(c) children.push(c);
}) });
return return;
} }
} }
if (lastRouter) { if (lastRouter) {
el.path = lastRouter.path + '/' + el.path el.path = lastRouter.path + "/" + el.path;
} }
children = children.concat(el) children = children.concat(el);
}) });
return children return children;
} }
// 动态路由遍历，验证是否具备权限 // 动态路由遍历，验证是否具备权限
export function filterDynamicRoutes(routes) { export function filterDynamicRoutes(routes) {
const res = [] const res = [];
routes.forEach(route => { routes.forEach((route) => {
debugger;
if (route.permissions) { if (route.permissions) {
if (auth.hasPermiOr(route.permissions)) { if (auth.hasPermiOr(route.permissions)) {
res.push(route) res.push(route);
} }
} else if (route.roles) { } else if (route.roles) {
if (auth.hasRoleOr(route.roles)) { if (auth.hasRoleOr(route.roles)) {
res.push(route) res.push(route);
} }
} }
}) });
return res return res;
} }
export const loadView = (view) => { export const loadView = (view) => {
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === "development") {
return (resolve) => require([`@/views/${view}`], resolve) return (resolve) => require([`@/views/${view}`], resolve);
} else { } else {
// 使用 import 实现生产环境的路由懒加载 // 使用 import 实现生产环境的路由懒加载
return () => import(`@/views/${view}`) return () => import(`@/views/${view}`);
} }
} };
export default permission export default permission;
src/utils/permission.js
View file @ 89fba505
import store from '@/store' import store from "@/store";
/** /**
* 字符权限校验 * 字符权限校验
...@@ -7,21 +7,25 @@ import store from '@/store' ...@@ -7,21 +7,25 @@ import store from '@/store'
*/ */
export function checkPermi(value) { export function checkPermi(value) {
if (value && value instanceof Array && value.length > 0) { if (value && value instanceof Array && value.length > 0) {
const permissions = store.getters && store.getters.permissions const permissions = store.getters && store.getters.permissions;
const permissionDatas = value const permissionDatas = value;
const all_permission = "*:*:*"; const all_permission = "*:*:*";
const hasPermission = permissions.some(permission => { const hasPermission = permissions.some((permission) => {
return all_permission === permission || permissionDatas.includes(permission) return (
}) all_permission === permission || permissionDatas.includes(permission)
);
});
if (!hasPermission) { if (!hasPermission) {
return false return false;
} }
return true return true;
} else { } else {
console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`) console.error(
return false `need roles! Like checkPermi="['system:user:add','system:user:edit']"`
);
return false;
} }
} }
...@@ -32,20 +36,20 @@ export function checkPermi(value) { ...@@ -32,20 +36,20 @@ export function checkPermi(value) {
*/ */
export function checkRole(value) { export function checkRole(value) {
if (value && value instanceof Array && value.length > 0) { if (value && value instanceof Array && value.length > 0) {
const roles = store.getters && store.getters.roles const roles = store.getters && store.getters.roles;
const permissionRoles = value const permissionRoles = value;
const super_admin = "admin"; const super_admin = "admin";
const hasRole = roles.some(role => { const hasRole = roles.some((role) => {
return super_admin === role || permissionRoles.includes(role) return super_admin === role || permissionRoles.includes(role);
}) });
if (!hasRole) { if (!hasRole) {
return false return false;
} }
return true return true;
} else { } else {
console.error(`need roles! Like checkRole="['admin','editor']"`) console.error(`need roles! Like checkRole="['admin','editor']"`);
return false return false;
} }
} }
\ No newline at end of file
src/views/home.vue 0 → 100644
View file @ 89fba505
<template>
<div>
<el-carousel height="1000px">
<el-carousel-item v-for="item in url" :key="item">
<!-- <h3 class="small">{{ item }}</h3> -->
<img :src="item" alt="">
</el-carousel-item>
</el-carousel>
</div>
</template>
<script>
export default {
data(){
return{
url:[require('@/assets/home/1.png'),require('../assets/home/2.png'),require('../assets/home/3.png'),require('@/assets/home/4.png')]
}
}
}
</script>
<style lang="scss" scoped>
img{
width: 100%;
}
</style>
\ No newline at end of file
src/views/risk/drawCanvas/index.vue
View file @ 89fba505
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<el-col :span="3"> <span class="riskTab type1"></span>重大风险</el-col> <el-col :span="3"> <span class="riskTab type1"></span>重大风险</el-col>
<el-col :span="3"> <span class="riskTab type2"></span>较大风险</el-col> <el-col :span="3"> <span class="riskTab type2"></span>较大风险</el-col>
<el-col :span="3"> <span class="riskTab type3"></span>一般风险</el-col> <el-col :span="3"> <span class="riskTab type3"></span>一般风险</el-col>
<el-col :span="3"> <span class="riskTab type4"></span>较小风险</el-col> <el-col :span="3"> <span class="riskTab type4"></span>低风险</el-col>
</el-row> </el-row>
</div> </div>
<el-row style="margin-top: 20px; margin-left: 20px"> <el-row style="margin-top: 20px; margin-left: 20px">
...@@ -419,8 +419,7 @@ export default { ...@@ -419,8 +419,7 @@ export default {
z-index: 999; z-index: 999;
} }
.north img { .north img {
width: 15px; width: 40px;
height: 30px;
} }
.footer { .footer {
/* position: fixed; */ /* position: fixed; */
......
src/views/risk/plan/index.vue
View file @ 89fba505
...@@ -157,6 +157,9 @@ ...@@ -157,6 +157,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="业态" prop="projectBusiness">
<el-input v-model="form.projectBusiness" placeholder="请输入业态" />
</el-form-item>
<el-form-item label="评估楼栋" prop="buildingIds"> <el-form-item label="评估楼栋" prop="buildingIds">
<el-select v-model="form.buildingIds" multiple medium placeholder="请选择评估楼栋"> <el-select v-model="form.buildingIds" multiple medium placeholder="请选择评估楼栋">
<el-option v-for="item in buildingOption" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in buildingOption" :key="item.id" :label="item.name" :value="item.id">
...@@ -323,6 +326,13 @@ ...@@ -323,6 +326,13 @@
trigger: 'blur' trigger: 'blur'
}, },
],
projectBusiness: [{
required: true,
message: '请输入业态',
trigger: 'blur'
},
], ],
buildingIds: [{ buildingIds: [{
required: true, required: true,
...@@ -419,6 +429,10 @@ ...@@ -419,6 +429,10 @@
this.form.buildingIds=null; this.form.buildingIds=null;
this.form.projectIdV=projectId; this.form.projectIdV=projectId;
} }
const selectProject =this.projectOptions.find(x=>x.id==projectId)
if(selectProject){
this.form.projectBusiness = selectProject.business||''
}
getBuildingList(projectId).then(response => { getBuildingList(projectId).then(response => {
this.buildingOption = response.data; this.buildingOption = response.data;
......
vue.config.js
View file @ 89fba505
...@@ -35,7 +35,8 @@ module.exports = { ...@@ -35,7 +35,8 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://192.168.4.232:8080`, //服务器地址 target: "http://192.168.10.137:8080/",
// target: `http://192.168.4.232:8080`, //服务器地址
// target: `http://192.168.15.230:8081`, //晓晋本地地址 // target: `http://192.168.15.230:8081`, //晓晋本地地址
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
...@@ -125,10 +126,10 @@ module.exports = { ...@@ -125,10 +126,10 @@ module.exports = {
}); });
config.optimization.runtimeChunk("single"), config.optimization.runtimeChunk("single"),
{ {
from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件 from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
to: "./", //到根目录下 to: "./", //到根目录下
}; };
}); });
}, },
}; };
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