From 283e5ad8bfe63c691d1b0989ce77697dfc754d58 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Tue, 17 May 2022 15:57:21 +0800 Subject: [PATCH] =?UTF-8?q?login=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9/?= =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=85=8D=E7=BD=AE=E9=A1=B5/=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E6=B3=A8=E5=86=8C=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 - src/main.js | 7 +- src/rem.js | 16 ---- .../archivesConfig/commonFields/index.vue | 21 +++++ .../archivesConfig/electronicFields/index.vue | 21 +++++ .../archivesConfig/systemFields/index.vue | 21 +++++ src/views/login.vue | 82 ++++++++----------- src/views/system/dept/index.vue | 6 +- src/views/system/menu/index.vue | 6 +- src/views/system/role/index.vue | 6 +- src/views/system/user/index.vue | 6 +- vue.config.js | 17 +--- 12 files changed, 125 insertions(+), 86 deletions(-) delete mode 100644 src/rem.js create mode 100644 src/views/archivesConfig/commonFields/index.vue create mode 100644 src/views/archivesConfig/electronicFields/index.vue create mode 100644 src/views/archivesConfig/systemFields/index.vue diff --git a/package.json b/package.json index 8162831..808498f 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,6 @@ "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", - "postcss-px2rem": "^0.3.0", - "px2rem-loader": "^0.1.9", "qs": "^6.10.1", "screenfull": "4.2.0", "sortablejs": "1.8.4", diff --git a/src/main.js b/src/main.js index 1db7832..ecf3e11 100644 --- a/src/main.js +++ b/src/main.js @@ -30,7 +30,12 @@ import router from './router/routers' import './assets/icons' // icon import './router/index' // permission control import 'echarts-gl' -import './rem' + +// 全局注册过滤 - 时间 +import { parseTime } from '@/utils/index.js' +Vue.filter('parseTime', function(time, cFormat) { + return parseTime(time, cFormat) +}) Vue.use(checkPer) Vue.use(VueHighlightJS) diff --git a/src/rem.js b/src/rem.js deleted file mode 100644 index 3cd2961..0000000 --- a/src/rem.js +++ /dev/null @@ -1,16 +0,0 @@ -// rem等比适配配置文件 -// 基准大小 -const baseSize = 16 -// 设置 rem 函数 -function setRem() { - // 当前页面屏幕分辨率相对于 1440宽的缩放比例,可根据自己需要修改 - const scale = document.documentElement.clientWidth / 1920 - // 设置页面根节点字体大小(“Math.min(scale, 3)” 指最高放大比例为3,可根据实际业务需求调整) - document.documentElement.style.fontSize = `${baseSize * Math.min(scale, 3)}px` -} -// 初始化 -setRem() -// 改变窗口大小时重新设置 rem -window.onresize = () => { - setRem() -} diff --git a/src/views/archivesConfig/commonFields/index.vue b/src/views/archivesConfig/commonFields/index.vue new file mode 100644 index 0000000..c429c6a --- /dev/null +++ b/src/views/archivesConfig/commonFields/index.vue @@ -0,0 +1,21 @@ + + 常用字段管理 + + + + + diff --git a/src/views/archivesConfig/electronicFields/index.vue b/src/views/archivesConfig/electronicFields/index.vue new file mode 100644 index 0000000..237a8a1 --- /dev/null +++ b/src/views/archivesConfig/electronicFields/index.vue @@ -0,0 +1,21 @@ + + 电子文件字段管理 + + + + + diff --git a/src/views/archivesConfig/systemFields/index.vue b/src/views/archivesConfig/systemFields/index.vue new file mode 100644 index 0000000..8528e53 --- /dev/null +++ b/src/views/archivesConfig/systemFields/index.vue @@ -0,0 +1,21 @@ + + 系统字段管理 + + + + + diff --git a/src/views/login.vue b/src/views/login.vue index a997758..ac4b381 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -38,12 +38,11 @@ /> - + - + @@ -63,7 +62,6 @@ 登 录 @@ -229,52 +227,50 @@ export default { display: flex; justify-content: center; align-items: center; - height: 100%; - width: 1920px; - // height: 1080px; + height: 100vh; position: relative; - background-size: cover; + background-size: 100% 100vh; } .title { - width: 327px; - height: 40px; font-size: 30px; - font-family: Microsoft YaHei-Regular, Microsoft YaHei; font-weight: 400; + text-align: center; + letter-spacing: 2px; color: #1e2864; - line-height: 0px; - margin-top: 104px; - margin-left: 87px; - // letter-spacing: 63px; - -webkit-background-clip: text; - // -webkit-text-fill-color: transparent; } .login-form { - width: 500px; - height: 600px; - background: #ffffff; - box-shadow: 0px 0px 16px 1px rgba(83, 83, 83, 0.16); - border-radius: 10px 10px 10px 10px; - opacity: 1; + width: 26%; + padding: 4% 2%; position: absolute; - left: 1078px; - top: 240px; + left: calc(100vw - 44%); + top: 50%; + transform: translateY(-50%); + background: #fff; + box-shadow: 0px 0px 16px 1px rgba(83, 83, 83, 0.16); + border-radius: 10px; .el-form-item { - width: 420px !important; + width: 100% !important; height: 50px; - background: #ffffff; - border-radius: 7px 7px 7px 7px; - opacity: 1; - margin-left: 40px; + background: #fff; + border-radius: 7px; .el-form-item__content{ height: 100%; .el-input{ - height: 100%; - input{ height: 100%; + input{ + height: 100%; + } } } + } + .login-code { + .el-form-item__content{ + display: flex; + justify-content: space-between; + .el-input{ + width: 60%; + } } } .input-icon { @@ -288,28 +284,20 @@ export default { } } .el-button { - width: 420px !important; + width: 100% !important; height: 52px; + margin-top: 22px; + font-size: 20px; background: #1e2864; - border-radius: 5px 5px 5px 5px; - margin-top:22px; - margin-bottom: 104px; + border-radius: 5px; color: #ffffff; - font-size: 20px; - border:none; - opacity: 1; + border: none; } } -.login-tip { - font-size: 13px; - text-align: center; - color: #bfbfbf; -} -.login-code { - width: 133px; +.code-img { height: 43px; + margin-left: 20px; display: inline-block; - float: right; img { width: 100%; height: 100% !important; diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index d02b846..8505f96 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -79,7 +79,11 @@ /> - + + + {{ scope.row.createTime | parseTime }} + + 是 - + + + {{ scope.row.createTime | parseTime }} + + - + + + {{ scope.row.createTime | parseTime }} + + - + + + {{ scope.row.createTime | parseTime }} + +