diff --git a/src/layout/header/components/update_avatar.vue b/src/layout/header/components/update_avatar.vue
index 80492c0..6e74c1f 100644
--- a/src/layout/header/components/update_avatar.vue
+++ b/src/layout/header/components/update_avatar.vue
@@ -29,9 +29,7 @@ import { setAvatar } from "@/request/api.js";
import { ElMessage } from "element-plus";
import { ref } from "vue";
import { useVModels } from "@vueuse/core";
-import { useUserStore } from "@/pinia/user.js";
-const userStore = useUserStore();
const props = defineProps({
visible: {
type: Boolean,
@@ -44,7 +42,7 @@ const props = defineProps({
default: () => ({}),
},
});
-const emits = defineEmits(["update:visible", "update:form"]);
+const emits = defineEmits(["update:visible", "update:form", "get-data"]);
const { visible, form } = useVModels(props, emits);
const formRef = ref(null);
const rules = {
@@ -60,13 +58,10 @@ const fnSubmit = debounce(
}
const formData = new FormData();
formData.append("FFILE", form.value.file[0].raw);
- const resData = await setAvatar(formData);
+ await setAvatar(formData);
fnClose();
ElMessage.success("修改成功");
- userStore.setUserInfo({
- ...userStore.getUserInfo,
- userPhoto: resData.userPhoto,
- });
+ emits("get-data");
},
{ atBegin: true }
);
diff --git a/src/layout/header/components/update_info.vue b/src/layout/header/components/update_info.vue
index 885a7c3..47538f1 100644
--- a/src/layout/header/components/update_info.vue
+++ b/src/layout/header/components/update_info.vue
@@ -67,7 +67,7 @@ const props = defineProps({
default: () => ({}),
},
});
-const emits = defineEmits(["update:visible", "update:form"]);
+const emits = defineEmits(["update:visible", "update:form", "get-data"]);
const { visible, form } = useVModels(props, emits);
const formRef = ref(null);
const validatePass = (rule, value, callback) => {
@@ -118,6 +118,7 @@ const fnSubmit = debounce(
});
fnClose();
ElMessage.success("修改成功");
+ emits("get-data");
},
{ atBegin: true }
);
diff --git a/src/layout/header/index.vue b/src/layout/header/index.vue
index 2723b5d..7b87f08 100644
--- a/src/layout/header/index.vue
+++ b/src/layout/header/index.vue
@@ -52,10 +52,12 @@
diff --git a/src/layout/menu/index.vue b/src/layout/menu/index.vue
index 411dc99..3c859dd 100644
--- a/src/layout/menu/index.vue
+++ b/src/layout/menu/index.vue
@@ -7,7 +7,8 @@
:route="{ path: menu.path }"
>
import { useVModels } from "@vueuse/core";
-import { reactive, onMounted } from "vue";
+import { reactive } from "vue";
import { findCharIndex } from "@/assets/js/utils.js";
const props = defineProps({
@@ -362,7 +362,7 @@ const data = reactive({
signs: [],
});
-onMounted(() => {
+const fnInit = () => {
data.info = props.pd.pd;
const measuresList = props.pd.measuresList;
for (let i = 0; i < measuresList.length; i++) {
@@ -382,8 +382,8 @@ onMounted(() => {
data.gasList = props.pd.gasList;
data.gas = props.pd.gas || {};
data.signs = props.pd.signs;
-});
-
+};
+fnInit();
const emits = defineEmits(["update:visible"]);
const { visible } = useVModels(props, emits);
const fnClose = () => {
diff --git a/src/views/BI/components/dialog/highwork_dialog.vue b/src/views/BI/components/dialog/highwork_dialog.vue
index 25c372f..3c49110 100644
--- a/src/views/BI/components/dialog/highwork_dialog.vue
+++ b/src/views/BI/components/dialog/highwork_dialog.vue
@@ -330,7 +330,7 @@
-
diff --git a/src/views/hazard_investigation/inspection_record/index.vue b/src/views/hazard_investigation/inspection_record/index.vue
index e547cac..cd421ae 100644
--- a/src/views/hazard_investigation/inspection_record/index.vue
+++ b/src/views/hazard_investigation/inspection_record/index.vue
@@ -133,7 +133,7 @@
DATESTART: row.DATESTART,
DATEEND: row.DATEEND,
ID: row.LISTMANAGER_ID,
- LIST_TYPE:row.LIST_TYPE,
+ LIST_TYPE: row.LIST_TYPE,
},
})
"
diff --git a/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue b/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue
index 29612a3..866e27a 100644
--- a/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue
+++ b/src/views/hazard_investigation/inventory_troubleshooting/components/qualified.vue
@@ -4,7 +4,10 @@
-
+
diff --git a/src/views/keyprojects/hidden/record_view.vue b/src/views/keyprojects/hidden/record_view.vue
index 488a0fc..7964a63 100644
--- a/src/views/keyprojects/hidden/record_view.vue
+++ b/src/views/keyprojects/hidden/record_view.vue
@@ -95,7 +95,6 @@ const fnGetData = async () => {
data.hiddenImgs = addingPrefixToFile(resData.pd.hiddenImgs);
data.ysImgs = addingPrefixToFile(resData.pd.ysImgs);
data.zgImgs = addingPrefixToFile(resData.pd.zgImgs);
-
};
fnGetData();
diff --git a/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue b/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
index b18ab27..7c1f51b 100644
--- a/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
+++ b/src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
@@ -95,7 +95,6 @@ const stateList = [
];
const router = useRouter();
const route = useRoute();
-console.log(route);
const { INSPECTION_ID } = route.query;
const userStore = useUserStore();
const USER_ID = userStore.getUserInfo.USER_ID;