glj-代码提交

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();
 					}

src/views/dataService/remoteSensingData/components/retrievalCondition.vue

@@ -55,22 +55,16 @@
                   </template>
                 </el-upload>
               </el-col>
-              <el-col :span="3">
                 <el-button class="ml10" type="success" style="margin-top:15px" @click="OpenuploadDataRef()">
                   Upload Img</el-button>
-              </el-col>
-              <el-col :span="3">
-                <el-button class="ml10" type="success" style="margin-top:15px" @click="approvalDataOpenList()">
+                <el-button class="ml10" type="success" style="margin-top:15px; margin-left:15px" @click="approvalDataOpenList()">
                   Batch operation</el-button>
-              </el-col>
-              <el-col :span="3" v-auth-role="'admin'"  style="margin-left:25px">
                 <el-button size="default" type="danger" v-auth-role="'admin'" class="upload-demo" style="margin-top: 15px; height: 40px;" @click="removeThis">
                   <el-icon>
                     <ele-Delete />
                   </el-icon>
                   Delete
                 </el-button>
-              </el-col>
             </el-row>
 
           </div>

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")
       })

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();
 					}

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;
 	});