diff --git a/src/components/tree/pqs/index.vue b/src/components/tree/pqs/index.vue index ed2cce9e..46fe67ab 100644 --- a/src/components/tree/pqs/index.vue +++ b/src/components/tree/pqs/index.vue @@ -11,7 +11,7 @@ />
- + diff --git a/src/views/pqs/auditManage/userInfo/index.vue b/src/views/pqs/auditManage/userInfo/index.vue index c2a653d9..45a0b07c 100644 --- a/src/views/pqs/auditManage/userInfo/index.vue +++ b/src/views/pqs/auditManage/userInfo/index.vue @@ -3,7 +3,7 @@ diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue b/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue index ddeec4a0..e8ae0446 100644 --- a/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue +++ b/src/views/pqs/bearingCapacity/evaluationList/components/charge.vue @@ -288,18 +288,21 @@ const equipment = (row: any) => {} // 承载能力评估 const assess = () => { // vxeRef.value.getRadioRecord() - - if (equipmentList.value.length == null) { - return ElMessage.warning('请选择用户') + + if (equipmentList.value.length == 0) { + return ElMessage.warning('请选择有终端设备的用户') } loading.value = true formRef.value.validate((valid: any) => { + if (valid) { form.value.devList = equipmentList.value carryCapacityEvaluate(form.value).then(res => { rendering(res.data) loading.value = false }) + }else{ + loading.value = false } }) } diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue index d7d87958..8d06d71b 100644 --- a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue +++ b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue @@ -734,6 +734,7 @@ const choose = (e: any) => { uploadExcel(e.raw, form).then(res => { ElMessage.success('导入成功') + onSubmit() }) } const tabChange = (e: any) => { diff --git a/src/views/pqs/business/log/TerminalLog/index.vue b/src/views/pqs/business/log/TerminalLog/index.vue index 26d149c9..4f773e94 100644 --- a/src/views/pqs/business/log/TerminalLog/index.vue +++ b/src/views/pqs/business/log/TerminalLog/index.vue @@ -8,7 +8,7 @@ - + - diff --git a/src/views/setting/dictionary/list/index.vue b/src/views/setting/dictionary/list/index.vue index 86dcccc3..57fe2231 100644 --- a/src/views/setting/dictionary/list/index.vue +++ b/src/views/setting/dictionary/list/index.vue @@ -8,6 +8,8 @@ v-model="tableStore.table.params.searchValue" clearable placeholder="请输入名称或编码筛选" + maxlength="32" + show-word-limit /> diff --git a/src/views/setting/dictionary/list/popupDetailEdit.vue b/src/views/setting/dictionary/list/popupDetailEdit.vue index 0a9a8aa6..1ca22bc5 100644 --- a/src/views/setting/dictionary/list/popupDetailEdit.vue +++ b/src/views/setting/dictionary/list/popupDetailEdit.vue @@ -3,16 +3,16 @@ - + - + - + - + diff --git a/src/views/setting/dictionary/list/popupEdit.vue b/src/views/setting/dictionary/list/popupEdit.vue index a8e36cbc..efd4e731 100644 --- a/src/views/setting/dictionary/list/popupEdit.vue +++ b/src/views/setting/dictionary/list/popupEdit.vue @@ -3,10 +3,10 @@ - + - + diff --git a/src/views/setting/dictionary/tree/popupForm.vue b/src/views/setting/dictionary/tree/popupForm.vue index 7750263c..350df953 100644 --- a/src/views/setting/dictionary/tree/popupForm.vue +++ b/src/views/setting/dictionary/tree/popupForm.vue @@ -3,13 +3,13 @@ - + - + - + diff --git a/src/views/system/auth/department/index.vue b/src/views/system/auth/department/index.vue index ee2d331e..23652f54 100644 --- a/src/views/system/auth/department/index.vue +++ b/src/views/system/auth/department/index.vue @@ -9,6 +9,8 @@ class="ml10" clearable @input="search" + maxlength="32" + show-word-limit />
diff --git a/src/views/system/auth/department/popupForm.vue b/src/views/system/auth/department/popupForm.vue index 4b1bd0a5..2e506e86 100644 --- a/src/views/system/auth/department/popupForm.vue +++ b/src/views/system/auth/department/popupForm.vue @@ -3,7 +3,7 @@ - + diff --git a/src/views/system/auth/userList/index.vue b/src/views/system/auth/userList/index.vue index cf7af519..982fc8e9 100644 --- a/src/views/system/auth/userList/index.vue +++ b/src/views/system/auth/userList/index.vue @@ -121,7 +121,7 @@ const tableStore = new TableStore({ return row.state !== 1 }, click: row => { - ElMessageBox.prompt('二次校验密码确认', '注销用户', { + ElMessageBox.prompt('二次校验密码确认', '修改密码', { confirmButtonText: '确认', cancelButtonText: '取消', inputType: 'password' diff --git a/src/views/system/auth/userList/popupEdit.vue b/src/views/system/auth/userList/popupEdit.vue index 23b646a3..a4d7fac9 100644 --- a/src/views/system/auth/userList/popupEdit.vue +++ b/src/views/system/auth/userList/popupEdit.vue @@ -4,8 +4,8 @@ - - + + diff --git a/src/views/system/bpm/category/categoryPopup.vue b/src/views/system/bpm/category/categoryPopup.vue index c53965ce..310943c7 100644 --- a/src/views/system/bpm/category/categoryPopup.vue +++ b/src/views/system/bpm/category/categoryPopup.vue @@ -4,10 +4,10 @@ - + - +