修改日志

src/layouts/admin/components/popup/password.vue

@@ -28,7 +28,9 @@ import { ElMessage } from 'element-plus'
 import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
 import { validatePwd } from '@/utils/common'
 import { useAdminInfo } from '@/stores/adminInfo'
-
+import router from '@/router'
+import { useNavTabs } from '@/stores/navTabs'
+const navTabs = useNavTabs()
 const adminInfo = useAdminInfo()
 const dialogVisible = ref(false)
 const title = ref('修改密码')
@@ -97,8 +99,14 @@ const submit = () => {
                     id: adminInfo.$state.userIndex,
                     newPassword: form.newPwd
                 }).then((res: any) => {
-                    ElMessage.success('密码修改成功')
+                    ElMessage.success('密码修改成功,请重新登录!')
                     dialogVisible.value = false
+                     setTimeout(() => {
+                    navTabs.closeTabs()
+                    window.localStorage.clear()
+                    adminInfo.reset()
+                    router.push({ name: 'login' })
+                }, 0)
                 })
             })
         }

src/views/pqs/business/log/frontLog/detail.vue

@@ -10,7 +10,7 @@
         </TableHeader>
 
         <div :key="key">
-            <Table ref="tableRef" :height="'49vh'"></Table>
+            <Table ref="tableRef" :height="'calc(50vh - 100px)'"></Table>
         </div>
     </el-dialog>
 </template>

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue

@@ -153,7 +153,7 @@ const typeOptions = ref([
     { label: 'cp95值', value: 4 }
 ])
 onMounted(() => {
-    datePickerRef.value.setTheDate(5)
+    datePickerRef.value.setTheDate(4)
     init()
 })
 const height: any = ref(mainHeight(200, 1))

src/views/pqs/harmonicMonitoring/reportForms/word/index.vue

@@ -43,7 +43,9 @@
                                 <el-button icon="el-icon-Upload" type="primary" class="mr10 ml10">上传接线图</el-button>
                             </template>
                         </el-upload>
-                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">生成</el-button>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">
+                            生成
+                        </el-button>
                     </template>
                 </TableHeader>
                 <div class="box">
@@ -107,10 +109,10 @@ const handleNodeClick = (data: any, node: any) => {
 }
 // 上传
 const choose = (files: any) => {
-    const isJPG = files.raw.type === 'image/jpg'
+    const isJPG = files.raw.type === 'image/jpeg'
     const isPNG = files.raw.type === 'image/png'
     if (!isJPG && !isPNG) {
-        ElMessage.warning('上传文件只能是 JPG/PNG 格式!')
+        ElMessage.warning('上传文件只能是 jpg/png 格式!')
         return false
     }
 
@@ -146,7 +148,8 @@ const exportEvent = () => {
     } else {
         loading.value = true
         ElMessage('生成报告中...')
-        exportModel(form).then((res: any) => {
+        exportModel(form)
+            .then((res: any) => {
                 let blob = new Blob([res], {
                     type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
                 })
@@ -154,13 +157,14 @@ const exportEvent = () => {
                 const url = window.URL.createObjectURL(blob)
                 const link = document.createElement('a') // 创建a标签
                 link.href = url
-            link.download = dotList.value.name+ dayjs().format('YYYYMMDD') // 设置下载的文件名
+                link.download = dotList.value.name + dayjs().format('YYYYMMDD') // 设置下载的文件名
                 document.body.appendChild(link)
                 link.click() //执行下载
                 document.body.removeChild(link)
-            loading.value =false
-        }).catch((err: any) => {
-            loading.value =false
+                loading.value = false
+            })
+            .catch((err: any) => {
+                loading.value = false
             })
     }
 }