diff --git a/src/App.vue b/src/App.vue index e85c41c..3a623ec 100644 --- a/src/App.vue +++ b/src/App.vue @@ -123,7 +123,6 @@ const onUpdate = async row => { } }; onMounted(async () => { - console.log(7777777777777); const res = await getSystemConfig({ configKey: "system_login_background" }); console.log(res); if (res.result && res.result.length > 0) { @@ -150,7 +149,6 @@ watch( () => route.path, n => { tabsShow.value = route.meta.showSidebar; - console.log(tabsShow.value, "====我是首页"); } ); diff --git a/src/layouts/components/Header/components/Message.vue b/src/layouts/components/Header/components/Message.vue index 129ef11..bf19c76 100644 --- a/src/layouts/components/Header/components/Message.vue +++ b/src/layouts/components/Header/components/Message.vue @@ -14,7 +14,7 @@ -
+
@@ -26,6 +26,10 @@
+
+ notData +
暂无通知
+
diff --git a/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue b/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue index 9aa1eff..0085b3e 100644 --- a/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue +++ b/src/views/enterprise/laborRealName/memberManage/components/addMemberForm.vue @@ -943,4 +943,12 @@ onMounted(() => { justify-content: center; align-items: center; } +:deep() { + .el-progress-bar { + display: none; + } + .el-progress__text { + display: none; + } +} diff --git a/src/views/jxjview/government/index.vue b/src/views/jxjview/government/index.vue index a433e81..6478498 100644 --- a/src/views/jxjview/government/index.vue +++ b/src/views/jxjview/government/index.vue @@ -384,7 +384,8 @@ const formConfig = { governmentTel: [ { required: true, - message: "请输入手机号码", + pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/, + message: "请输入正确的手机号", trigger: "blur" } ], diff --git a/src/views/login/CompanyLogon/basic-form.scss b/src/views/login/CompanyLogon/basic-form.scss index 3cb1949..c443d31 100644 --- a/src/views/login/CompanyLogon/basic-form.scss +++ b/src/views/login/CompanyLogon/basic-form.scss @@ -55,3 +55,12 @@ $primary: #409eff; } } } + +:deep() { + .el-progress-bar { + display: none; + } + .el-progress__text { + display: none; + } +} diff --git a/src/views/login/CompanyLogon/basic-form.vue b/src/views/login/CompanyLogon/basic-form.vue index 92c23b6..0bc91dd 100644 --- a/src/views/login/CompanyLogon/basic-form.vue +++ b/src/views/login/CompanyLogon/basic-form.vue @@ -33,25 +33,18 @@ - + 选择文件 @@ -80,7 +73,7 @@ - + diff --git a/src/views/login/CompanyLogon/unit-table.scss b/src/views/login/CompanyLogon/unit-table.scss index 7088196..db8a3e6 100644 --- a/src/views/login/CompanyLogon/unit-table.scss +++ b/src/views/login/CompanyLogon/unit-table.scss @@ -76,3 +76,11 @@ $primary: #409eff; } } } +:deep() { + .el-progress-bar { + display: none; + } + .el-progress__text { + display: none; + } +} diff --git a/src/views/login/ProJectForm/index.vue b/src/views/login/ProJectForm/index.vue index 0c24b8d..0f4079a 100644 --- a/src/views/login/ProJectForm/index.vue +++ b/src/views/login/ProJectForm/index.vue @@ -41,7 +41,7 @@ - + @@ -97,7 +97,14 @@ const rules = reactive({ ], projectName: [{ required: true, message: "请输入项目名称", trigger: "blur" }], governmentSn: [{ required: true, message: "请选择住建局", trigger: "change" }], - phone: [{ required: true, trigger: "blur", message: "手机号格式不正确", pattern: /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/ }], + phone: [ + { + required: true, + trigger: "blur", + message: "手机号格式不正确", + pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/ + } + ], password: [{ required: true, message: "请输入密码", trigger: "blur" }], projectAddress: [{ required: true, message: "请输入定位", trigger: "change" }], diff --git a/src/views/project/laborRealName/memberManage/components/addMemberForm.vue b/src/views/project/laborRealName/memberManage/components/addMemberForm.vue index fa76402..14b4374 100644 --- a/src/views/project/laborRealName/memberManage/components/addMemberForm.vue +++ b/src/views/project/laborRealName/memberManage/components/addMemberForm.vue @@ -968,4 +968,12 @@ onMounted(() => { justify-content: center; align-items: center; } +:deep() { + .el-progress-bar { + display: none; + } + .el-progress__text { + display: none; + } +}