Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 410a3c0c by liangzhen
Options

样式调整

1 parent c42224ff
Inline Side-by-side
Showing with 99 additions and 170 deletions
public/js/system.config.js
......@@ -3,7 +3,7 @@
*/
const SystemConfig = {
// 系统名称
SYS_NAME: '数字化架构设计与管控支撑工具',
SYS_NAME: '数字化架构管控工具',
// 默认分页每页显示数量
DEFAULT_PAGE_SIZE: 30,
// 默认主题颜色
......
src/api/comCenterServeListNew.js
import { get, post, download } from "@/utils/http";
import { post,} from "@/utils/http";
import {
EADC_ARRCHITECTURE,
......
src/api/index.js
import { post, download } from '@/utils/http'
import {FRAMEWORK_ASSERT} from '@/config/micromodule'
import {FRAMEWORK_ASSERT,ARCH_MANAGE} from '@/config/micromodule'
export function query_jia_gou_yuan_su_guan_xi_table(params) {
//查询架构元素管理表格
return post(FRAMEWORK_ASSERT + '/ele/', params)
......@@ -235,7 +235,7 @@ export function editJiShuZhengCeJieGouHuaTable(params) {
// 典型案例库管理-所有下拉值
export function getDianXingAnLiSelectData(params) {
// return post('/shared/vi/dict/gDictByKey', params);
return post(FRAMEWORK_ASSERT + '/dict/gDictByKey', params)
return post(ARCH_MANAGE + '/dict/gDictByKey', params)
}
//所有下拉值
export function gAllDictKey(params) {
......@@ -445,15 +445,15 @@ export function queryGuanLianZiChanSelect(params) {
}
// 日志管理，列表
export function queryLogManageTable(params) {
return post(FRAMEWORK_ASSERT + '/sysEventLog/', params)
return post(ARCH_MANAGE + '/sysEventLog/', params)
}
// 日志管理，存储上限
export function queryLogManageStorageUpper(params) {
return post(FRAMEWORK_ASSERT + '/dictDetail/details', params)
return post(ARCH_MANAGE + '/dictDetail/details', params)
}
// 日志管理，总记录
export function queryLogManageAllLog(params) {
return post(FRAMEWORK_ASSERT + '/sysEventLog/getTjCount', params)
return post(ARCH_MANAGE + '/sysEventLog/getTjCount', params)
}
// 现状资产架构，表格
export function getCurrentZiChanJiaGouTable(params) {
......
src/components/common/dialog.vue
......@@ -188,9 +188,12 @@ export default {
background-color: $com_backcolor2;
font-size: $com_fontSize +2;
color: #fff;
line-height: 24px;
line-height: 20px;
font-size: 16px;
font-weight: 600;
padding: 20px;
position: relative;
text-align: left;
.titletips{
margin-left: 8px;
color: #fa3745;
......@@ -204,7 +207,7 @@ export default {
}
}
.fy-dialog-main {
padding: 0 10px;
padding: 20px;
height: calc(100% - 114px);
overflow: auto;
}
......@@ -265,7 +268,7 @@ export default {
background: #14cabf;
}
.fy-dialog-footer .sure {
background: #559ef8;
background: #0d867f;
padding: 5px 15px;
margin: 0 20px;
cursor: pointer;
......@@ -273,6 +276,6 @@ export default {
}
.fy-dialog-footer .sure:hover {
background: #136cda;
background: #14cabf;
}
</style>
\ No newline at end of file
src/styles/common.scss
$color-primary: #0d867f;
$com_color_black: #000000; // 系统主字体颜色
$com_fontSize: 13px;
$com_backcolor2: #009b9c!important; // 系统主体颜色2 leftMenu 可点击可打开目录
$com_backcolor2: #0d867f !important; // 系统主体颜色2 leftMenu 可点击可打开目录
@for $i from 0 through 50 {
.font-#{$i} {
font-size: #{$i}px;
......
src/views/Main/index.vue
......@@ -4,7 +4,7 @@
<div class="logo_title_container">
<div class="left_container">
<img src="@/assets/main/system_logo.png" alt="" class="system_logo" />
<div class="logo_title">数字化架构设计与管控支撑工具</div>
<div class="logo_title">数字化架构管控工具</div>
</div>
<div class="operate_menu">
<div class="operate_menu_item">
......
src/views/login/index.vue
......@@ -28,12 +28,6 @@
<span class="svg-container">
<svg-icon icon-class="password" />
</span>
<!--
<div>
<input />
</div>
-->
<el-input
:key="passwordType"
ref="password"
......@@ -52,23 +46,17 @@
</el-form-item>
<el-button class="loginBtn" :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">{{loginText}}</el-button>
<!-- <div class="tips">
<span style="margin-right:20px;">账号: 13800000002</span>
<span> 密码: 123456</span>
</div> -->
</el-form>
</div>
</template>
<script>
import { validMobile } from '@/utils/validate'
import { mapActions } from 'vuex'
export default {
name: 'Login',
data() {
const validateMobile = (rule, value, callback) => {
validMobile(value) ? callback() : callback(new Error('用户名格式不正确'))
validMobile(value) ? callback() : callback(new Error('用户名不正确'))
}
return {
loginForm: {
......@@ -147,7 +135,7 @@ export default {
/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
$bg:#283443;
$light_gray: #68b0fe; // 将输入框颜色改成蓝色
$light_gray: gray; // 将输入框颜色改成蓝色
$cursor: #fff;
@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
......@@ -190,7 +178,8 @@ $cursor: #fff;
color: #454545;
}
.el-form-item__error {
color: #fff
color: #F56C6C;
margin-top: 2px;
}
.loginBtn {
background: #39817c;
......
src/views/system/personnel/index.vue
......@@ -12,27 +12,15 @@
<div class="btn-wrap">
<label class="form-label">人员姓名/人员编号</label>
<el-input class="iptx" v-model="params.selectVal" placeholder="搜索条件" maxlength="30" show-word-limit :value="params.selectVal" @input="e => params.selectVal = validForbid (e)" ></el-input>
<!-- <label class="form-label">人员姓名</label>
<el-input v-model="params.selectVal" placeholder="输入搜索条件"></el-input>-->
<el-button type="primary" size="mini" style="margin-right: auto;" @click="searchList" v-if="btnControl('system-personnel_queryBar_query', btn_authControl)">查询</el-button>
<div class="rightBtn">
<el-button type="success" @click="operationEvent('addnew')" v-if="btnControl('system-personnel_queryBar_add', btn_authControl)">
<el-button type="primary" size="mini" style="margin-right: auto;" @click="searchList" v-if="btnControl('system-personnel_queryBar_query', btn_authControl)" icon="el-icon-search">查询</el-button>
</div>
<div class="rightBtn">
<el-button type="primary" plain @click="operationEvent('addnew')" v-if="btnControl('system-personnel_queryBar_add', btn_authControl)">
<i class="el-icon-circle-plus-outline"></i>添加专家
</el-button>
</div>
<!-- <el-button type="success" @click="operationEvent('add')">
<i class="el-icon-circle-plus-outline"></i>新建
</el-button> -->
<!-- <el-button type="primary" @click="operationEvent('edit')">
<i class="el-icon-edit-outline"></i>修改
</el-button>-->
<!-- <el-button type="danger" @click="userBatchDelete">
<i class="el-icon-delete"></i>删除
</el-button> -->
</div>
<!-- 表格 -->
<div class="table-wrap" ref="tableWrap">
......@@ -48,7 +36,7 @@
<el-table
border
style="width: 100%"
height="calc(100% - 100px)"
height="calc(100%-1px)"
:data="tableData"
@selection-change="handleSelectionChange"
:row-class-name="tableRowClassName"
......@@ -68,13 +56,6 @@
<el-table-column fixed="right" prop="conduct" label="操作" width="180" align="left">
<template slot-scope="scope">
<!-- <span class="column-span" @click="operationEvent('add')">新增</span>
<span class="column-span" @click="operationEvent('edit',scope.row)">编辑</span>
<span class="column-span" @click="operationEvent('delete',scope.row)">删除</span>-->
<!--<el-button type="success" @click="operationEvent('add')">
<i class="el-icon-circle-plus-outline"></i>新增
</el-button>-->
<el-button type="primary" plain @click="operationEvent('edit',scope.row)" v-if="btnControl('system-personnel_table_edit', btn_authControl)">
<i class="el-icon-edit"></i>编辑
</el-button>
......@@ -108,7 +89,7 @@
<div class="dialog-box system-function">
<div class="form-item">
<div class="form-item-inline">
<label class="form-label">
<label class="form-label dialog-label">
<span class="impot">*</span>组织名称
</label>
<!-- 树形菜单 -->
......@@ -125,14 +106,13 @@
</div>
<div class="form-item-inline">
<label class="form-label">
<label class="form-label dialog-label">
<span class="impot">*</span>人员姓名
</label>
<el-input
style="width: 280px;"
style="width: 207px;"
v-model="formData.name"
placeholder="请填写人员姓名"
maxlength="30"
show-word-limit
:value="formData.name"
@input="e => formData.name = validForbid (e)"
......@@ -148,8 +128,8 @@
</div>-->
</div>
<div class="form-item">
<div class="form-item-inline">
<label class="form-label">角色类型</label>
<div class="form-item-inline ">
<label class="form-label dialog-label">角色类型</label>
<el-select
filterable
multiple
......@@ -167,11 +147,11 @@
</div>
<div class="form-item-inline">
<label class="form-label">
<label class="form-label dialog-label">
<span class="impot">*</span>人员编码
</label>
<el-input
style="width: 280px;"
style="width: 207px;"
v-model="formData.userCode"
placeholder="请填写人员编码"
maxlength="30"
......@@ -181,35 +161,16 @@
disabled
></el-input>
</div>
<!-- <div class="form-item-inline">
<label class="form-label"><span class="impot">*</span>员工类型</label>
<el-select
v-model="formData.userType"
placeholder="请选择"
@change="onSelected($event,'userType')"
>
<el-option
v-for="(item,idnex) in userTypes"
:key="idnex"
:label="item.name"
:value="item.code"
></el-option>
</el-select>
</div>-->
</div>
<div class="form-item-inline">
<div class="form-item">
<!-- <div class="form-item-inline">
<label class="form-label"><span class="impot">*</span>手机号</label>
<el-input style="width: 280px;" maxlength="11" @blur="blurCheck($event,'phone')" v-model="formData.phone" placeholder="请填写11位有效手机号码"></el-input>
</div>-->
<label class="form-label">
<!-- <span class="impot"></span> -->数据范围
</label>
<label class="form-label dialog-label">
数据范围
</label>
<!-- 树形菜单 -->
<el-cascader
ref="cascaderData"
style="200px"
style="280px"
placeholder="请选择数据范围"
:change-on-select="true"
:clearable="true"
......@@ -218,47 +179,13 @@
:options="treeData"
@change="noChangeSelectDataPerm"
></el-cascader>
<!-- <div class="form-item-inline">
<label class="form-label">密码
</label>
<el-input
style="width: 280px;"
placeholder="请填写密码"
type="password"
v-model="formData.password"
auto-complete="off"
></el-input>
</div>-->
</div>
</div>
<!-- <div class="form-item">
<div class="form-item-inline">
<label class="form-label"><span class="impot">*</span>入职时间</label>
<el-date-picker
v-model="formData.entryTime"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择入职时间">
</el-date-picker>
</div>
<div class="form-item-inline">
<label class="form-label"><span class="impot">*</span>出生日期</label>
<el-date-picker
v-model="formData.birthday"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择出生日期">
</el-date-picker>
</div>
</div>-->
<div class="form-item">
<div class="form-item-inline">
<label class="form-label">
<label class="form-label dialog-label">
<span class="impot">*</span>启用状态
</label>
<el-select
......@@ -331,6 +258,7 @@
></el-input>
<label class="form-label">账号</label>
<el-input
class="ipt"
v-model="paramss.userLoginCode"
placeholder="搜索条件"
maxlength="30"
......@@ -339,7 +267,7 @@
@input="e => paramss.userLoginCode = validForbid (e)"
></el-input>
<el-button type="success" @click="getAddList">查询</el-button>
<el-button type="primary" @click="getAddList" class="userQuery" >查询</el-button>
</div>
<el-table
border
......@@ -351,9 +279,9 @@
@selection-change="selectAdd"
>
<el-table-column type="selection" width="40" align="center"></el-table-column>
<el-table-column type="index" width="50" label="序号" align="center"></el-table-column>
<el-table-column prop="name" label="用户姓名" width="150"></el-table-column>
<el-table-column prop="userCode" label="用户编码" width="150"></el-table-column>
<el-table-column type="index" width="auto" label="序号" align="center"></el-table-column>
<el-table-column prop="name" label="用户姓名" width="auto"></el-table-column>
<el-table-column prop="userCode" label="用户编码" width="auto"></el-table-column>
<!-- <el-table-column prop="phone" label="手机号码"></el-table-column> -->
</el-table>
</my-dialog1>
......@@ -377,7 +305,7 @@
userUpdate,
userGetId,
roleList,
addLog,
getAddExpertList,
addExpertUser
} from "@/api/system";
......@@ -541,12 +469,6 @@
this.page.total = res.data.total;
this.page.current = res.data.current;
}
addLog({
eventtype: "1", //事件类型
eventcontent: this.$route.meta.title+"查询", //事件内容
logtype: "0", //日志类型
loglev: "0" //日志级别
});
});
},
//获取树结构
......@@ -583,12 +505,6 @@
this.$refs.dialogVisible.hidden();
this.getList();
}
addLog({
eventtype: "2", //事件类型
eventcontent: this.$route.meta.title+"新建", //事件内容
logtype: "1", //日志类型
loglev: "0" //日志级别
});
});
},
//获取员工类型
......@@ -673,12 +589,6 @@
}
}
addLog({
eventtype: "12", //事件类型
eventcontent: this.$route.meta.title+"详情", //事件内容
logtype: "0", //日志类型
loglev: "0" //日志级别
});
});
},
//删除单条
......@@ -689,12 +599,7 @@
this.getTree();
this.getList();
}
addLog({
eventtype: "11", //事件类型
eventcontent: this.$route.meta.title+"删除", //事件内容
logtype: "1", //日志类型
loglev: "0" //日志级别
});
});
},
//批量删除多条
......@@ -714,12 +619,7 @@
this.getTree();
this.getList();
}
addLog({
eventtype: "11", //事件类型
eventcontent: this.$route.meta.title+"删除", //事件内容
logtype: "0", //日志类型
loglev: "0" //日志级别
});
});
});
},
......@@ -737,12 +637,7 @@
this.$refs.dialogVisible.hidden();
}
addLog({
eventtype: "4", //事件类型
eventcontent: this.$route.meta.title+"修改", //事件内容
logtype: "1", //日志类型
loglev: "0" //日志级别
});
});
},
......@@ -910,6 +805,14 @@
<style lang="scss" scoped>
.system-function {
.form-item-inline{
margin-top: 20px;
.dialog-label{
display: inline-block;
width: 80px;
text-align: left;
}
}
.el-input {
width: 280px;
}
......@@ -919,6 +822,7 @@
.el-dialog__body{
.my-dialog-body{
position: relative;
text-align: left;
}
}
}
......@@ -977,14 +881,18 @@
<style lang="scss" scoped>
// 需要整理 合并到这里
.main-wrap{
padding: 20px;
width: 100%;
.breadcrumb-wrap{
background-color:#E5F8F4;
}
// 搜索 操作按钮
.btn-wrap{
text-align: left;
margin-bottom: 10px;
.iptx{
width: 250px;
margin: 0 10px;
}
}
.addExpertMode{
......@@ -1012,4 +920,24 @@
.el-cascader-panel .el-cascader-node__postfix {
top: 10px;
}
.form-label{
font-size: 14px;
/* margin: 3px 20px 3px 0; */
}
.rightBtn{
text-align:left;
}
.el-button--success{
color: #0d867f;
background: #e7f3f2;
border-color: #9ecfcc;
}
.el-button--success :hover{
color: #e7f3f2;
background: #0d867f;
}
.userQuery{
margin-left: 20px;
}
</style>
\ No newline at end of file
src/views/system/roleAdmin/index.vue
......@@ -18,11 +18,11 @@
:value="params.name"
@input="e => params.name = validForbid (e)"
></el-input>
<el-button type="primary" size="mini" style="margin-right: auto;" @click="searchList" v-if="btnControl('system-role_queryBar_query', btn_authControl)">查询</el-button>
<el-button type="primary" size="mini" style="margin-right: auto;" @click="searchList" v-if="btnControl('system-role_queryBar_query', btn_authControl)" icon="el-icon-search">查询</el-button>
<div class="rightBtn">
<el-button type="success" @click="operationEvent('add')" v-if="btnControl('system-role_queryBar_addRole', btn_authControl)">
<i class="el-icon-circle-plus-outline"></i>新建角色
<el-button type="primary" plain @click="operationEvent('add')" v-if="btnControl('system-role_queryBar_addRole', btn_authControl)">
<i class="el-icon-circle-plus-outline" ></i>新建角色
</el-button>
</div>
</div>
......@@ -34,7 +34,7 @@
<el-table
border
:data="tableData"
height="calc(100% - 100px)"
height="calc(100% - 1px)"
@selection-change="handleSelectionChange"
:row-class-name="tableRowClassName"
:header-cell-style="{background:'#c0ebe4',color:'#0c554a', textAlign: 'center'}"
......@@ -537,15 +537,21 @@
<style lang="scss" scoped>
// 需要整理 合并到这里
.main-wrap{
padding: 20px;
width: 100%;
.breadcrumb-wrap{
background-color:#E5F8F4;
}
// 搜索 操作按钮
.btn-wrap{
text-align: left;
.iptx{
margin: 0 10px;
width: 250px;
}
}
}
.rightBtn{
margin-top: 20px;
}
</style>
\ No newline at end of file
vue.config.js
......@@ -15,7 +15,7 @@ function resolve(dir) {
// const ip = '192.168.137.146'; // 谢皓
// const ip = '2068224he2.51mypc.cn'; // 谢皓
const ip = '127.0.0.1'
const ip = '192.168.69.1'
// const ip = '192.168.0.13';
// const ip = '192.168.137.229'
module.exports = defineConfig({
......@@ -64,7 +64,7 @@ module.exports = defineConfig({
},
chainWebpack: (config) => {
config.plugin('html').tap((args) => {
args[0].title = '数字化架构设计与管控支撑工具'
args[0].title = '数字化架构管控工具'
return args
})
},
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!