diff --git a/src/assets/js/api/loginSign.js b/src/assets/js/api/loginSign.js
index bdf1f2ca..9f313b84 100644
--- a/src/assets/js/api/loginSign.js
+++ b/src/assets/js/api/loginSign.js
@@ -32,7 +32,7 @@ export const exportSafeLogListApi = data => post('xmgl/operationLog/exportXls',
// 消息中心
export const getInfoListApi = data => get('xmgl/xzNotice/page', data);
export const markInfoReadApi = data => post('xmgl/xzNotice/markRead', data);
-export const deleteInfoApi = data => post('xmgl/xzNotice/delete', data);
+export const batchDeleteInfoApi = data => post('xmgl/xzNotice/batchDelete', data);
// 工作台用户绑定的组织架构
export const getGroupListApi = data => post('xmgl/company/getTenantOrgTreeList', data);
diff --git a/src/router/index.js b/src/router/index.js
index f39483fb..2c912c29 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -23,6 +23,11 @@ const routes2 = [
// component: () => import("../views/home/login_v1.vue"),
component: () => import("../views/home/login_v2.vue"),
},
+ {
+ path: "/resetPassword",
+ name: "重置密码",
+ component: () => import("../views/resetPassword/index.vue"),
+ },
{
path: "/sign",
name: "注册",
diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue
index 18f2eadc..6e66a249 100644
--- a/src/views/home/login_v2.vue
+++ b/src/views/home/login_v2.vue
@@ -148,7 +148,8 @@
>{{ $t("message.login.login") }}
-
+
+ 忘记密码
{{
loginType == 1 ? "用户账号注册" : "供应商账号注册"
}}
@@ -602,6 +603,10 @@ export default {
goLogin() {
this.isLogin = true;
},
+ // 去重置密码
+ goReset(){
+ this.$router.push({ path: "/resetPassword" });
+ },
// 去注册
goRegister() {
this.isLogin = false;
@@ -1129,6 +1134,11 @@ export default {
height: 24px;
}
}
+ .operate-btn{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
.register-btn {
display: flex;
align-items: center;
@@ -1162,7 +1172,7 @@ export default {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #8e8e8e;
- cursor: pointer;
+ // cursor: pointer;
}
.span_placeholder {
diff --git a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
index 95f3234a..dc72dc27 100644
--- a/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
+++ b/src/views/infoCenter/allInfo/componentsModule/dataListData.vue
@@ -26,7 +26,6 @@
clearable
v-model="searchForm.title"
/>
-
@@ -72,7 +71,7 @@
- {{
+ {{
scope.row.title
}}
@@ -109,23 +108,19 @@
返回
-
人员未在场预警
+
{{rowObj.title}}
- 应用:劳务管理系统
- 标签:预警信息
- 接收时间:2024/03/03 23:50:00
+ 应用:{{rowObj.app}}
+ 标签:{{rowObj.tag}}
+ 接收时间:{{rowObj.operateTime}}
-
人员未在场预警
-
人员未在场预警
-
人员未在场预警
-
人员未在场预警
-
人员未在场预警
+
{{rowObj.content}}
+
diff --git a/src/views/userCenter/userCenter/componentsModule/dataFormData.vue b/src/views/userCenter/userCenter/componentsModule/dataFormData.vue
index f2e6ce48..a754b452 100644
--- a/src/views/userCenter/userCenter/componentsModule/dataFormData.vue
+++ b/src/views/userCenter/userCenter/componentsModule/dataFormData.vue
@@ -126,6 +126,7 @@ export default {
this.getImgCode();
}
});
+ this.getImgCode();
} else {
console.log("error submit!!");
return false;