Commit a8ad5e4b authored by 赵伟庚's avatar 赵伟庚

[fix](首页配置): 输入框去除首尾空格,全平台新建替换为新增

parent 867796aa
......@@ -35,7 +35,7 @@
<div class="apaas_button">
<el-button class="register_btn" type="primary" @click="register">
<bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon>
</el-button>
</div>
</template>
......@@ -100,8 +100,8 @@
</div>
</div>
</div>
<!-- 新/编辑弹窗 -->
<el-dialog class="dialog_box" :title="addType == 1 ? '新' : '编辑'" v-model="addDialog" width="758px">
<!-- 新/编辑弹窗 -->
<el-dialog class="dialog_box" :title="addType == 1 ? '新' : '编辑'" v-model="addDialog" width="758px">
<el-form ref="bgForm" :model="formData" :rules="rules" label-width="80px" class="bg_form">
<el-form-item label="名称" prop="name">
<el-input
......@@ -179,7 +179,7 @@ const state = reactive({
bgForm,
typeList: [], // 分类数据
typeKeyword: "", // 分类删选关键词
nodeClassifyId: null, // 当前选中分类的uuid 用于新字典
nodeClassifyId: null, // 当前选中分类的uuid 用于新字典
nodeId: null, // 当前选中分类的id 用于请求列表
timer: null, // 定时器
headers: [
......@@ -376,7 +376,7 @@ const register = () => {
}
state.addType = 1;
state.addDialog = true;
}; // 新字典按钮
}; // 新字典按钮
const edit_row = (row) => {
axios
......
......@@ -32,7 +32,7 @@ const contactForm = reactive({
const props = defineProps({
formType: {
type: Boolean,
default: false, //false 新 true 编辑
default: false, //false 新 true 编辑
},
id: {
type: String,
......
......@@ -4,7 +4,7 @@
<el-breadcrumb separator="/">
<el-breadcrumb-item> 开发管理 </el-breadcrumb-item>
<el-breadcrumb-item :to="{ path: '/develop/account' }"> 系统账号管理 </el-breadcrumb-item>
<el-breadcrumb-item> {{ route.query.id ? "编辑" : "" }} </el-breadcrumb-item>
<el-breadcrumb-item> {{ route.query.id ? "编辑" : "" }} </el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="page_content flex_cloumn">
......@@ -73,8 +73,8 @@
? "业务系统编辑成功"
: "业务系统编辑失败"
: successFlag
? "业务系统新成功"
: "业务系统新失败"
? "业务系统新成功"
: "业务系统新失败"
}}
</div>
<el-button @click="cancel">返回列表</el-button>
......
......@@ -87,7 +87,7 @@ import { ElMessage } from "element-plus";
const props = defineProps({
formType: {
type: Boolean,
default: false, //false 新 true 编辑
default: false, //false 新 true 编辑
},
id: {
type: String,
......
......@@ -39,7 +39,7 @@
<div class="apaas_button">
<el-button class="register_btn" type="primary" @click="addAccount">
<bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon>
</el-button>
<el-button class="register_btn" @click="deleteBatch"> 批量删除 </el-button>
<el-button class="register_btn" @click="resetPsd"> 重置密码 </el-button>
......
......@@ -42,8 +42,8 @@
ref="treeAction"
v-show="actionFlag"
:style="{ top: acTop, left: acLeft, bottom: acBottom }">
<div class="action" @click="fileAction(1, selectData, selectParentData)">本级</div>
<div class="action" @click="fileAction(2, selectData, selectParentData)">下级</div>
<div class="action" @click="fileAction(1, selectData, selectParentData)">本级</div>
<div class="action" @click="fileAction(2, selectData, selectParentData)">下级</div>
<div class="action" @click="fileAction(3, selectData, selectParentData)">删除</div>
<div
class="action"
......@@ -176,7 +176,7 @@ const getMenuTree = (type, id) => {
handleNodeClick(state.data[0]);
}
} else {
// 上下移,初始化时默认选中节点 新选中新增的节点
// 上下移,初始化时默认选中节点 新选中新增的节点
if (id) {
findData(state.data, id);
}
......@@ -298,7 +298,7 @@ const filterNode = (val, data) => {
const fileAction = (val, data, parent, disabled = false) => {
if (val == 1) {
// 新本级菜单
// 新本级菜单
state.addType = 1;
let newChild = {
menu_name: "新菜单", // 菜单名称
......@@ -323,7 +323,7 @@ const fileAction = (val, data, parent, disabled = false) => {
handleNodeClick(newChild);
state.newMenuId++;
} else if (val == 2) {
// 新下级菜单
// 新下级菜单
if (disabled) {
return;
}
......@@ -493,7 +493,7 @@ const saveMenu = (el, type) => {
// 新增
if (state.selectParentData) {
if (state.selectParentData.menu_type == 1 && el.menuForm.menu_type == 0) {
ElMessage.error("菜单之下不可以新目录");
ElMessage.error("菜单之下不可以新目录");
return;
}
}
......
<template>
<el-form :model="formData" :rules="formRules" ref="form" style="max-width: 1048px" class="form">
<el-form-item label="banner名称" prop="banner_name">
<el-input v-model="formData.banner_name" />
<el-input v-model.trim="formData.banner_name" />
</el-form-item>
<el-form-item label="链接地址(选填)" prop="link_address">
<el-input v-model="formData.link_address" />
<el-input v-model.trim="formData.link_address" />
</el-form-item>
<el-form-item label="上传banner图片" prop="banner_image">
<bg-upload-image
......
......@@ -6,10 +6,10 @@
<div class="content_top">
<el-form :model="formData" :rules="formRules" ref="formRef" style="max-width: 1048px" class="form">
<el-form-item label="公司名称" prop="company_name">
<el-input v-model="formData.company_name" placeholder="请输入公司名称" show-word-limit maxlength="50" />
<el-input v-model.trim="formData.company_name" placeholder="请输入公司名称" show-word-limit maxlength="50" />
</el-form-item>
<el-form-item label="公司地址" prop="company_address">
<el-input v-model="formData.company_address" placeholder="请输入公司地址" show-word-limit maxlength="100" />
<el-input v-model.trim="formData.company_address" placeholder="请输入公司地址" show-word-limit maxlength="100" />
</el-form-item>
<el-form-item label="公司logo" prop="logo">
<bg-upload-image
......@@ -23,7 +23,7 @@
:accept="['.jpg', '.jpeg', '.png']"></bg-upload-image>
</el-form-item>
<el-form-item label="公司电话" prop="contact_phone">
<el-input v-model="formData.contact_phone" placeholder="请输入公司电话" show-word-limit maxlength="20" />
<el-input v-model.trim="formData.contact_phone" placeholder="请输入公司电话" show-word-limit maxlength="20" />
</el-form-item>
</el-form>
</div>
......
......@@ -33,7 +33,7 @@ import { ElMessage } from "element-plus";
const props = defineProps({
formType: {
type: String,
default: "create", //false 新 true 编辑
default: "create", //false 新 true 编辑
},
});
......
......@@ -42,7 +42,7 @@ import { ElMessage } from "element-plus";
const props = defineProps({
formType: {
type: String,
default: "create", //false 新 true 编辑
default: "create", //false 新 true 编辑
},
});
const orgForm = reactive({
......
......@@ -65,7 +65,7 @@ const route = useRoute();
const props = defineProps({
formType: {
type: Boolean,
default: false, //false 新 true 编辑
default: false, //false 新 true 编辑
},
id: {
type: String,
......
......@@ -55,7 +55,7 @@ import axios from "@/request/http.js";
const props = defineProps({
formType: {
type: Boolean,
default: false, //false 新 true 编辑
default: false, //false 新 true 编辑
},
id: {
type: String,
......
......@@ -41,38 +41,38 @@
v-if="selectData && selectData.data_type === 2"
class="action"
@click="treeAction({ type: 'directory', action: 'create', target: null })">
目录
目录
</div>
<div
v-if="selectData && selectData.data_type === 2"
class="action"
@click="treeAction({ type: 'org', action: 'create', target: null })">
组织
组织
</div>
<!-- 目录 -->
<div
v-if="selectData && selectData.data_type === 0"
class="action"
@click="treeAction({ type: 'directory', action: 'create', target: 'local' })">
本级目录
本级目录
</div>
<div
v-if="selectData && selectData.data_type === 0"
class="action"
@click="treeAction({ type: 'directory', action: 'create', target: 'child' })">
下级目录
下级目录
</div>
<div
v-if="selectData && selectData.data_type === 0 && selectData.level !== 1"
class="action"
@click="treeAction({ type: 'org', action: 'create', target: 'local' })">
本级组织
本级组织
</div>
<div
v-if="selectData && selectData.data_type === 0"
class="action"
@click="treeAction({ type: 'org', action: 'create', target: 'child' })">
下级组织
下级组织
</div>
<div
v-if="selectData && selectData.data_type === 0"
......@@ -109,7 +109,7 @@
v-if="selectData && selectData.data_type === 1"
class="action"
@click="treeAction({ type: 'org', action: 'create', target: 'local' })">
本级组织
本级组织
</div>
<div
v-if="selectData && selectData.data_type === 1"
......
......@@ -5,7 +5,7 @@
<el-breadcrumb separator="/">
<el-breadcrumb-item> 系统管理 </el-breadcrumb-item>
<el-breadcrumb-item to="/system/role"> 角色管理 </el-breadcrumb-item>
<el-breadcrumb-item> {{ route.query.id ? "编辑" : "" }} </el-breadcrumb-item>
<el-breadcrumb-item> {{ route.query.id ? "编辑" : "" }} </el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="main_container">
......
......@@ -13,7 +13,7 @@
<div class="apaas_button">
<el-button class="register_btn" type="primary" @click="register">
<bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon>
</el-button>
<el-button class="register_btn" type="primary" @click="deleteRows"> 批量删除 </el-button>
<div class="select_text">
......@@ -346,9 +346,9 @@ const clearRoleSelection = () => {
};
const register = () => {
console.log("角色");
console.log("角色");
router.push("/system/role/add");
}; // 新角色
}; // 新角色
const edit_row = (row) => {
console.log(row, "编辑角色");
......
......@@ -136,7 +136,7 @@ var adminMenu = [
path: "/develop/account",
children: [
{
menuName: "账号",
menuName: "账号",
dict_group_id: "09938937-3db9-47de-b967-7777ea4ebb2d",
menuType: 2, //system:64c156e0-bfff-4bfc-a63a-56effe130a25:apaas后管,能力注册页等 font:2cb4f767-fad7-44f2-afa3-f055e15dd2b6:apaas前台页 manager:09938937-3db9-47de-b967-7777ea4ebb2d:apaas管理中心 知识中心:26d3903a-863e-4efc-b53e-0fb8772ddaa4
path: "/develop/account/add",
......
//路由前端原则可以不写,但是需要在recorder中记录,防止以后忘记
//不用新父路由的文件,父路由全部由parent/parent.vue来支撑
//不用新父路由的文件,父路由全部由parent/parent.vue来支撑
import {createRouter, createWebHashHistory} from "vue-router";
import store from '../store'
......
......@@ -135,7 +135,7 @@ var router = [
path: "/develop/account",
children: [
{
menuName: "账号",
menuName: "账号",
dict_group_id: "09938937-3db9-47de-b967-7777ea4ebb2d",
menuType: 2, //system:64c156e0-bfff-4bfc-a63a-56effe130a25:apaas后管,能力注册页等 font:2cb4f767-fad7-44f2-afa3-f055e15dd2b6:apaas前台页 manager:09938937-3db9-47de-b967-7777ea4ebb2d:apaas管理中心 知识中心:26d3903a-863e-4efc-b53e-0fb8772ddaa4
path: "/develop/account/add",
......
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