Commit 410a3c0c by liangzhen

样式调整

1 parent c42224ff
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
const SystemConfig = { const SystemConfig = {
// 系统名称 // 系统名称
SYS_NAME: '数字化架构设计与管控支撑工具', SYS_NAME: '数字化架构管控工具',
// 默认分页每页显示数量 // 默认分页每页显示数量
DEFAULT_PAGE_SIZE: 30, DEFAULT_PAGE_SIZE: 30,
// 默认主题颜色 // 默认主题颜色
......
import { get, post, download } from "@/utils/http"; import { post,} from "@/utils/http";
import { import {
EADC_ARRCHITECTURE, EADC_ARRCHITECTURE,
......
import { post, download } from '@/utils/http' 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) { export function query_jia_gou_yuan_su_guan_xi_table(params) {
//查询架构元素管理表格 //查询架构元素管理表格
return post(FRAMEWORK_ASSERT + '/ele/', params) return post(FRAMEWORK_ASSERT + '/ele/', params)
...@@ -235,7 +235,7 @@ export function editJiShuZhengCeJieGouHuaTable(params) { ...@@ -235,7 +235,7 @@ export function editJiShuZhengCeJieGouHuaTable(params) {
// 典型案例库管理-所有下拉值 // 典型案例库管理-所有下拉值
export function getDianXingAnLiSelectData(params) { export function getDianXingAnLiSelectData(params) {
// return post('/shared/vi/dict/gDictByKey', 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) { export function gAllDictKey(params) {
...@@ -445,15 +445,15 @@ export function queryGuanLianZiChanSelect(params) { ...@@ -445,15 +445,15 @@ export function queryGuanLianZiChanSelect(params) {
} }
// 日志管理,列表 // 日志管理,列表
export function queryLogManageTable(params) { export function queryLogManageTable(params) {
return post(FRAMEWORK_ASSERT + '/sysEventLog/', params) return post(ARCH_MANAGE + '/sysEventLog/', params)
} }
// 日志管理,存储上限 // 日志管理,存储上限
export function queryLogManageStorageUpper(params) { export function queryLogManageStorageUpper(params) {
return post(FRAMEWORK_ASSERT + '/dictDetail/details', params) return post(ARCH_MANAGE + '/dictDetail/details', params)
} }
// 日志管理,总记录 // 日志管理,总记录
export function queryLogManageAllLog(params) { export function queryLogManageAllLog(params) {
return post(FRAMEWORK_ASSERT + '/sysEventLog/getTjCount', params) return post(ARCH_MANAGE + '/sysEventLog/getTjCount', params)
} }
// 现状资产架构,表格 // 现状资产架构,表格
export function getCurrentZiChanJiaGouTable(params) { export function getCurrentZiChanJiaGouTable(params) {
......
...@@ -188,9 +188,12 @@ export default { ...@@ -188,9 +188,12 @@ export default {
background-color: $com_backcolor2; background-color: $com_backcolor2;
font-size: $com_fontSize +2; font-size: $com_fontSize +2;
color: #fff; color: #fff;
line-height: 24px; line-height: 20px;
font-size: 16px;
font-weight: 600;
padding: 20px; padding: 20px;
position: relative; position: relative;
text-align: left;
.titletips{ .titletips{
margin-left: 8px; margin-left: 8px;
color: #fa3745; color: #fa3745;
...@@ -204,7 +207,7 @@ export default { ...@@ -204,7 +207,7 @@ export default {
} }
} }
.fy-dialog-main { .fy-dialog-main {
padding: 0 10px; padding: 20px;
height: calc(100% - 114px); height: calc(100% - 114px);
overflow: auto; overflow: auto;
} }
...@@ -265,7 +268,7 @@ export default { ...@@ -265,7 +268,7 @@ export default {
background: #14cabf; background: #14cabf;
} }
.fy-dialog-footer .sure { .fy-dialog-footer .sure {
background: #559ef8; background: #0d867f;
padding: 5px 15px; padding: 5px 15px;
margin: 0 20px; margin: 0 20px;
cursor: pointer; cursor: pointer;
...@@ -273,6 +276,6 @@ export default { ...@@ -273,6 +276,6 @@ export default {
} }
.fy-dialog-footer .sure:hover { .fy-dialog-footer .sure:hover {
background: #136cda; background: #14cabf;
} }
</style> </style>
\ No newline at end of file
$color-primary: #0d867f; $color-primary: #0d867f;
$com_color_black: #000000; // 系统主字体颜色 $com_color_black: #000000; // 系统主字体颜色
$com_fontSize: 13px; $com_fontSize: 13px;
$com_backcolor2: #009b9c!important; // 系统主体颜色2 leftMenu 可点击可打开目录 $com_backcolor2: #0d867f !important; // 系统主体颜色2 leftMenu 可点击可打开目录
@for $i from 0 through 50 { @for $i from 0 through 50 {
.font-#{$i} { .font-#{$i} {
font-size: #{$i}px; font-size: #{$i}px;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="logo_title_container"> <div class="logo_title_container">
<div class="left_container"> <div class="left_container">
<img src="@/assets/main/system_logo.png" alt="" class="system_logo" /> <img src="@/assets/main/system_logo.png" alt="" class="system_logo" />
<div class="logo_title">数字化架构设计与管控支撑工具</div> <div class="logo_title">数字化架构管控工具</div>
</div> </div>
<div class="operate_menu"> <div class="operate_menu">
<div class="operate_menu_item"> <div class="operate_menu_item">
......
...@@ -28,12 +28,6 @@ ...@@ -28,12 +28,6 @@
<span class="svg-container"> <span class="svg-container">
<svg-icon icon-class="password" /> <svg-icon icon-class="password" />
</span> </span>
<!--
<div>
<input />
</div>
-->
<el-input <el-input
:key="passwordType" :key="passwordType"
ref="password" ref="password"
...@@ -52,23 +46,17 @@ ...@@ -52,23 +46,17 @@
</el-form-item> </el-form-item>
<el-button class="loginBtn" :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">{{loginText}}</el-button> <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> </el-form>
</div> </div>
</template> </template>
<script> <script>
import { validMobile } from '@/utils/validate' import { validMobile } from '@/utils/validate'
import { mapActions } from 'vuex'
export default { export default {
name: 'Login', name: 'Login',
data() { data() {
const validateMobile = (rule, value, callback) => { const validateMobile = (rule, value, callback) => {
validMobile(value) ? callback() : callback(new Error('用户名格式不正确')) validMobile(value) ? callback() : callback(new Error('用户名不正确'))
} }
return { return {
loginForm: { loginForm: {
...@@ -147,7 +135,7 @@ export default { ...@@ -147,7 +135,7 @@ export default {
/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */ /* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
$bg:#283443; $bg:#283443;
$light_gray: #68b0fe; // 将输入框颜色改成蓝色 $light_gray: gray; // 将输入框颜色改成蓝色
$cursor: #fff; $cursor: #fff;
@supports (-webkit-mask: none) and (not (cater-color: $cursor)) { @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
...@@ -190,7 +178,8 @@ $cursor: #fff; ...@@ -190,7 +178,8 @@ $cursor: #fff;
color: #454545; color: #454545;
} }
.el-form-item__error { .el-form-item__error {
color: #fff color: #F56C6C;
margin-top: 2px;
} }
.loginBtn { .loginBtn {
background: #39817c; background: #39817c;
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
:value="params.name" :value="params.name"
@input="e => params.name = validForbid (e)" @input="e => params.name = validForbid (e)"
></el-input> ></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"> <div class="rightBtn">
<el-button type="success" @click="operationEvent('add')" v-if="btnControl('system-role_queryBar_addRole', btn_authControl)"> <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>新建角色 <i class="el-icon-circle-plus-outline" ></i>新建角色
</el-button> </el-button>
</div> </div>
</div> </div>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<el-table <el-table
border border
:data="tableData" :data="tableData"
height="calc(100% - 100px)" height="calc(100% - 1px)"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
:header-cell-style="{background:'#c0ebe4',color:'#0c554a', textAlign: 'center'}" :header-cell-style="{background:'#c0ebe4',color:'#0c554a', textAlign: 'center'}"
...@@ -537,15 +537,21 @@ ...@@ -537,15 +537,21 @@
<style lang="scss" scoped> <style lang="scss" scoped>
// 需要整理 合并到这里 // 需要整理 合并到这里
.main-wrap{ .main-wrap{
padding: 20px;
width: 100%; width: 100%;
.breadcrumb-wrap{ .breadcrumb-wrap{
background-color:#E5F8F4; background-color:#E5F8F4;
} }
// 搜索 操作按钮 // 搜索 操作按钮
.btn-wrap{ .btn-wrap{
text-align: left;
.iptx{ .iptx{
margin: 0 10px;
width: 250px; width: 250px;
} }
} }
} }
.rightBtn{
margin-top: 20px;
}
</style> </style>
\ No newline at end of file
...@@ -15,7 +15,7 @@ function resolve(dir) { ...@@ -15,7 +15,7 @@ function resolve(dir) {
// const ip = '192.168.137.146'; // 谢皓 // const ip = '192.168.137.146'; // 谢皓
// const ip = '2068224he2.51mypc.cn'; // 谢皓 // 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.0.13';
// const ip = '192.168.137.229' // const ip = '192.168.137.229'
module.exports = defineConfig({ module.exports = defineConfig({
...@@ -64,7 +64,7 @@ module.exports = defineConfig({ ...@@ -64,7 +64,7 @@ module.exports = defineConfig({
}, },
chainWebpack: (config) => { chainWebpack: (config) => {
config.plugin('html').tap((args) => { config.plugin('html').tap((args) => {
args[0].title = '数字化架构设计与管控支撑工具' args[0].title = '数字化架构管控工具'
return args return args
}) })
}, },
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!