From aefcd3d4e378651f362f08dc56b83b867ec90e72 Mon Sep 17 00:00:00 2001
From: LiuJiaNan <liujianan@zcloudchina.com>
Date: Mon, 5 Feb 2024 14:12:24 +0800
Subject: [PATCH] init

---
 .../header/components/update_avatar.vue       | 11 +++--------
 src/layout/header/components/update_info.vue  |  3 ++-
 src/layout/header/index.vue                   |  2 ++
 src/layout/menu/index.vue                     |  6 ++++--
 .../dialog/confinedspace_dialog.vue           |  8 ++++----
 .../BI/components/dialog/highwork_dialog.vue  |  7 ++++---
 .../BI/components/dialog/hotwork_dialog.vue   |  7 ++++---
 src/views/BI/components/rightico.vue          | 19 ++++---------------
 src/views/BI/components/video_ai_analysis.vue | 15 +--------------
 .../supplementary_recording.vue               |  1 -
 .../inspection_record/index.vue               |  2 +-
 .../components/qualified.vue                  |  5 ++++-
 src/views/keyprojects/hidden/record_view.vue  |  1 -
 .../hidden_list.vue                           |  1 -
 14 files changed, 33 insertions(+), 55 deletions(-)

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 @@
     <update-info
       v-model:visible="data.userDialog.visible"
       v-model:form="data.userDialog.form"
+      @get-data="fnGetInfo"
     />
     <update-avatar
       v-model:visible="data.avatarDialog.visible"
       v-model:form="data.avatarDialog.form"
+      @get-data="fnGetInfo"
     />
   </div>
 </template>
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 }"
     >
       <component
-        :is="'icon-application-menu'"
+        v-if="menu.meta?.icon"
+        :is="'icon-' + menu.meta.icon"
         theme="filled"
         fill="#a5b2c2"
         size="18"
@@ -20,7 +21,8 @@
     <el-sub-menu v-else-if="fnIsShowSubmenu(menu)" :index="menu.path">
       <template #title>
         <component
-          :is="'icon-application-menu'"
+          v-if="menu.meta?.icon"
+          :is="'icon-' + menu.meta.icon"
           theme="filled"
           fill="#a5b2c2"
           size="18"
diff --git a/src/views/BI/components/dialog/confinedspace_dialog.vue b/src/views/BI/components/dialog/confinedspace_dialog.vue
index 4a8821c..2722906 100644
--- a/src/views/BI/components/dialog/confinedspace_dialog.vue
+++ b/src/views/BI/components/dialog/confinedspace_dialog.vue
@@ -337,7 +337,7 @@
 
 <script setup>
 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 @@
 
 <script setup>
 import { useVModels } from "@vueuse/core";
-import { reactive, onMounted } from "vue";
+import { reactive } from "vue";
 import { findCharIndex } from "@/assets/js/utils.js";
 
 const props = defineProps({
@@ -353,7 +353,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++) {
@@ -371,7 +371,8 @@ onMounted(() => {
   }
   data.measuresList = measuresList;
   data.signs = props.pd.signs;
-});
+};
+fnInit();
 
 const emits = defineEmits(["update:visible"]);
 const { visible } = useVModels(props, emits);
diff --git a/src/views/BI/components/dialog/hotwork_dialog.vue b/src/views/BI/components/dialog/hotwork_dialog.vue
index 9c5575a..ffdec88 100644
--- a/src/views/BI/components/dialog/hotwork_dialog.vue
+++ b/src/views/BI/components/dialog/hotwork_dialog.vue
@@ -348,7 +348,7 @@
 
 <script setup>
 import { useVModels } from "@vueuse/core";
-import { reactive, onMounted } from "vue";
+import { reactive } from "vue";
 import { findCharIndex } from "@/assets/js/utils.js";
 
 const props = defineProps({
@@ -371,7 +371,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++) {
@@ -390,7 +390,8 @@ onMounted(() => {
   data.measuresList = measuresList;
   data.gasList = props.pd.gasList;
   data.signs = props.pd.signs;
-});
+};
+fnInit();
 
 const emits = defineEmits(["update:visible"]);
 const { visible } = useVModels(props, emits);
diff --git a/src/views/BI/components/rightico.vue b/src/views/BI/components/rightico.vue
index 074332c..1b12376 100644
--- a/src/views/BI/components/rightico.vue
+++ b/src/views/BI/components/rightico.vue
@@ -17,7 +17,9 @@
 <script setup>
 import { reactive } from "vue";
 import { reduction } from "../js/map";
+import { useFullscreen } from "@vueuse/core";
 
+const { isFullscreen, toggle } = useFullscreen();
 const data = reactive({
   rightOptionsList: [
     {
@@ -32,9 +34,9 @@ const data = reactive({
       img: new URL("/src/assets/images/map/rico1.png", import.meta.url).href,
       checkImg: new URL("/src/assets/images/map/rico1_on.png", import.meta.url)
         .href,
-      check: true,
+      check: isFullscreen,
       label: "全屏",
-      action: fullscreen,
+      action: toggle,
     },
     {
       img: new URL("/src/assets/images/map/rico2.png", import.meta.url).href,
@@ -59,19 +61,6 @@ const data = reactive({
     },
   ],
 });
-
-function fullscreen() {
-  const el = document.documentElement;
-  if (el.requestFullscreen) {
-    el.requestFullscreen();
-  } else if (el.msRequestFullscreen) {
-    el.msRequestFullscreen();
-  } else if (el.mozRequestFullScreen) {
-    el.mozRequestFullScreen();
-  } else if (el.webkitRequestFullscreen) {
-    el.webkitRequestFullscreen();
-  }
-}
 </script>
 <style scoped lang="scss">
 .right_options {
diff --git a/src/views/BI/components/video_ai_analysis.vue b/src/views/BI/components/video_ai_analysis.vue
index 219a8a7..df2232d 100644
--- a/src/views/BI/components/video_ai_analysis.vue
+++ b/src/views/BI/components/video_ai_analysis.vue
@@ -47,7 +47,7 @@
 <script setup>
 import LayoutTitle from "./title.vue";
 import CountUp from "vue-countup-v3";
-import { onMounted, reactive } from "vue";
+import { reactive } from "vue";
 import echarts1 from "../js/echarts1.js";
 import echarts2 from "../js/echarts2.js";
 import {
@@ -128,19 +128,6 @@ const getCameraAlarmTypeData = async () => {
 getCameraAlarmData();
 getCameraAlarmTimeData();
 getCameraAlarmTypeData();
-onMounted(() => {
-  echarts1(
-    "main1",
-    ["烟雾", "水电", "烟雾", "烟雾", "烟雾"],
-    [12.2, 15, 11, 8, 16]
-  );
-  echarts2(
-    "main2",
-    ["1月", "2月", "3月", "4月", "5月", "6月", "7月"],
-    [393, 831, 933, 1200, 1386, 1721, 2027],
-    [393, 438, 102, 267, 186, 315, 316]
-  );
-});
 </script>
 <style scoped lang="scss">
 .container {
diff --git a/src/views/hazard_investigation/checklist_inspection_status/supplementary_recording.vue b/src/views/hazard_investigation/checklist_inspection_status/supplementary_recording.vue
index d986a42..a748971 100644
--- a/src/views/hazard_investigation/checklist_inspection_status/supplementary_recording.vue
+++ b/src/views/hazard_investigation/checklist_inspection_status/supplementary_recording.vue
@@ -16,4 +16,3 @@ const { LIST_TYPE } = route.query;
 </script>
 
 <style scoped></style>
-
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 @@
       <el-row>
         <el-col v-if="writeresults" :span="24">
           <el-form-item label="检查结果" prop="CHECK_RESULT">
-            <el-input v-model="form.CHECK_RESULT" placeholder="请输入检查结果" />
+            <el-input
+              v-model="form.CHECK_RESULT"
+              placeholder="请输入检查结果"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="24">
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();
 </script>
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;