diff --git a/src/layout/navBars/breadcrumb/updatePassword.vue b/src/layout/navBars/breadcrumb/updatePassword.vue index 6440300..42a7939 100644 --- a/src/layout/navBars/breadcrumb/updatePassword.vue +++ b/src/layout/navBars/breadcrumb/updatePassword.vue @@ -117,7 +117,7 @@ const rules = reactive({ //判断res.data 是否存在 或者等于false 或者空 if (res.data || res.data == false || res.data == "") { //提示是否注册 - callback(new Error("The email is not registered")); + callback(new Error("This email account cannot be operated")); } else { callback(); } diff --git a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue index ffed339..ac5d258 100644 --- a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue +++ b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue @@ -55,22 +55,16 @@ - Upload Img - - - + Batch operation - - Delete - diff --git a/src/views/dataService/visualData/index.vue b/src/views/dataService/visualData/index.vue index 2042c17..19c1384 100644 --- a/src/views/dataService/visualData/index.vue +++ b/src/views/dataService/visualData/index.vue @@ -286,10 +286,14 @@ const generateData = () => { keywords: 'word clouds', }] ).then(ret => { + console.log(ret,"retretretret"); + if (ret == 1042) { ElMessage.error("error") } else { landsat(ret[0].disasterId, 30, ret[0].id).then(res => { + console.log(res,"resresresres"); + getTableData; ElMessage.success("success") }) diff --git a/src/views/login/component/forgotPassword.vue b/src/views/login/component/forgotPassword.vue index 64802a7..edfaf64 100644 --- a/src/views/login/component/forgotPassword.vue +++ b/src/views/login/component/forgotPassword.vue @@ -107,7 +107,7 @@ const rules = reactive({ //判断res.data 是否存在 或者等于false 或者空 if (res.data || res.data == false || res.data == "") { //提示是否注册 - callback(new Error("The email is not registered")); + callback(new Error("This email account cannot be operated")); } else { callback(); } diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue index ef1e982..a5f0bf9 100644 --- a/src/views/responseManagement/userResponse/index.vue +++ b/src/views/responseManagement/userResponse/index.vue @@ -613,6 +613,14 @@ const cancelApporval = () => { } }; + +//获取字典数据 +const getDictBizData = () => { + getDictionary({ code: 'disaster' }).then(res => { + state.dictList = res; + }) +} + const ApproveUserEnd = (row) => { state.disasterData = row; state.emailDialogVisibleNew = true; @@ -819,6 +827,7 @@ const showLatLon = (e) => { // 页面加载时 onMounted(() => { getTableData(); + getDictBizData(); getDictionary({ code: 'disaster' }).then((res) => { state.disasterTypeList = res; });