diff --git a/.env.development b/.env.development index f538ac7..763dd23 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 太仓资产管理系统 +VUE_APP_TITLE = 太仓市网络资产核查管理系统 # 开发环境配置 ENV = 'development' diff --git a/.env.production b/.env.production index cd2ab4f..2e2e52f 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,9 @@ # 页面标题 -VUE_APP_TITLE = 太仓资产管理系统 +VUE_APP_TITLE = 太仓市网络资产核查管理系统 # 生产环境配置 ENV = 'production' # 若依管理系统/生产环境 -# VUE_APP_BASE_API = 'http://39.101.188.84:9115' -VUE_APP_BASE_API = 'http://20.1.0.164/api' +VUE_APP_BASE_API = 'http://39.101.188.84:9115' +# VUE_APP_BASE_API = 'http://20.1.0.164/api' diff --git a/.env.staging b/.env.staging index 67f246e..e18e0df 100644 --- a/.env.staging +++ b/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 太仓资产管理系统 +VUE_APP_TITLE = 太仓市网络资产核查管理系统 NODE_ENV = production diff --git a/package.json b/package.json index 4792d90..d4c53f5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ruoyi", "version": "3.8.8", - "description": "太仓资产管理系统", + "description": "太仓市网络资产核查管理系统", "author": "若依", "license": "MIT", "scripts": { diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 7db03e2..06afb82 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -60,7 +60,10 @@ font-weight: bold; font-size: 20px; color: #FFFFFF; - line-height: 50px; + line-height: 30px; + overflow: hidden; + padding: 10px 10px 0 10px; + box-sizing: border-box; } } diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index e98fc2b..9e07b06 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -48,7 +48,7 @@ export default { min-height: calc(100vh - 100px); } - .fixed-header + .app-main { + .fixed-header+.app-main { padding-top: 84px; } } @@ -75,4 +75,5 @@ export default { background-color: #c0c0c0; border-radius: 3px; } + diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 7cdb95e..5b03676 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -1,7 +1,7 @@ @@ -71,60 +73,78 @@ export default { this.$store.dispatch('LogOut').then(() => { location.href = '/index'; }) - }).catch(() => {}); + }).catch(() => { }); } } } diff --git a/src/views/components/renwuType/index_v1.vue b/src/views/components/renwuType/index_v1.vue index 1a32e32..a12f908 100644 --- a/src/views/components/renwuType/index_v1.vue +++ b/src/views/components/renwuType/index_v1.vue @@ -407,7 +407,6 @@ export default { console.log(111); setTimeout(() => { this.$refs.ruleForm.clearValidate() - }, 100); }) }, diff --git a/src/views/components/renwuType/index_v2.vue b/src/views/components/renwuType/index_v2.vue index 9dcba4a..4e56d02 100644 --- a/src/views/components/renwuType/index_v2.vue +++ b/src/views/components/renwuType/index_v2.vue @@ -6,106 +6,89 @@ 基本信息
- + - + - - + + + + +
- + - - + + + - - + - - + pattern: /^[a-zA-Z0-9]{18}$/, + message: '请输入正确格式的18位统一社会信用代码', + trigger: 'change' + } + ]"> + + - + - + - + - + - + - + - + - - + @@ -113,166 +96,153 @@ - + - + - + - + - + - + - + - + - + - - - + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: '请输入正确的手机号码', + trigger: 'change' + } + ]"> + + - - - + type: 'email', + message: '请输入正确的邮箱地址', + trigger: ['change', 'change'] + } + ]"> + + - + - + - + - + + + + + + - - + + +
-               
{{ruleForm.bfyy}}
-             
+                
{{ ruleForm.bfyy }}
+              
- + 关停 - 取消 - 暂存 - 提交 + 取消 + 暂存 + 提交 - + 不通过 - 通过 + 通过
- +