diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue index d26f548..477237b 100644 --- a/src/layout/components/HeaderSys/index.vue +++ b/src/layout/components/HeaderSys/index.vue @@ -12,6 +12,13 @@ {{ item.title }}

+ +
+ + + +
+
@@ -42,6 +49,11 @@ + + + + + @@ -51,7 +63,9 @@ import useAppStore from '@/store/modules/app'; import useUserStore from '@/store/modules/user'; import UserCenter from '@/views/system/user/profile/index'; //个人中心 +import newsDiaLOG from '@/views/system/user/profile/newsDiaLOG'; //消息通知 import userImg from '@/assets/images/login/user.png'; //默认头像 +import xiaoxi from '@/assets/images/login/xiaoxi_icon.png'; import bus from '@/utils/mitt'; import { ElMessageBox } from 'element-plus'; import usePermissionStore from '@/store/modules/permission'; @@ -59,6 +73,7 @@ const permissionStore = usePermissionStore(); const { proxy } = getCurrentInstance(); const dialogShow = ref(false); +const dialogNews = ref(false); const appStore = useAppStore(); const userStore = useUserStore(); const menuList = ref([]); @@ -119,6 +134,12 @@ localStorage.setItem('routerPartXG', 'Project'); //默认加载项目首页 } +// 消息弹框 +function goNews() { + console.log('123'); + dialogNews.value = true; +} + onMounted(() => { // 动态获取路由返回子菜单 permissionStore.sidebarRouters.map(item => { @@ -161,8 +182,20 @@ font-size: 28px; } } + .goNews { + width: 29px; + height: 29px; + text-align: center; + padding-right: 8px; + cursor: pointer; + img { + width: 22px; + height: 22px; + margin-top: 4px; + } + } .headerMenu { - width: 1500px; + width: 1400px; height: 100%; display: flex; align-items: center; @@ -192,7 +225,6 @@ height: 100%; display: flex; align-items: center; - &:focus { outline: none; } diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue index d26f548..477237b 100644 --- a/src/layout/components/HeaderSys/index.vue +++ b/src/layout/components/HeaderSys/index.vue @@ -12,6 +12,13 @@ {{ item.title }}

+ +
+ + + +
+
@@ -42,6 +49,11 @@ + + + + + @@ -51,7 +63,9 @@ import useAppStore from '@/store/modules/app'; import useUserStore from '@/store/modules/user'; import UserCenter from '@/views/system/user/profile/index'; //个人中心 +import newsDiaLOG from '@/views/system/user/profile/newsDiaLOG'; //消息通知 import userImg from '@/assets/images/login/user.png'; //默认头像 +import xiaoxi from '@/assets/images/login/xiaoxi_icon.png'; import bus from '@/utils/mitt'; import { ElMessageBox } from 'element-plus'; import usePermissionStore from '@/store/modules/permission'; @@ -59,6 +73,7 @@ const permissionStore = usePermissionStore(); const { proxy } = getCurrentInstance(); const dialogShow = ref(false); +const dialogNews = ref(false); const appStore = useAppStore(); const userStore = useUserStore(); const menuList = ref([]); @@ -119,6 +134,12 @@ localStorage.setItem('routerPartXG', 'Project'); //默认加载项目首页 } +// 消息弹框 +function goNews() { + console.log('123'); + dialogNews.value = true; +} + onMounted(() => { // 动态获取路由返回子菜单 permissionStore.sidebarRouters.map(item => { @@ -161,8 +182,20 @@ font-size: 28px; } } + .goNews { + width: 29px; + height: 29px; + text-align: center; + padding-right: 8px; + cursor: pointer; + img { + width: 22px; + height: 22px; + margin-top: 4px; + } + } .headerMenu { - width: 1500px; + width: 1400px; height: 100%; display: flex; align-items: center; @@ -192,7 +225,6 @@ height: 100%; display: flex; align-items: center; - &:focus { outline: none; } diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue index dd4a428..d863a89 100644 --- a/src/views/publicService/publicmind.vue +++ b/src/views/publicService/publicmind.vue @@ -27,14 +27,15 @@ @@ -63,7 +64,6 @@ const showSearch = ref(true); const allData = reactive({ - a: '', queryParams: { pageNum: 1, pageSize: 10, @@ -80,13 +80,6 @@ tableData.value = response.data; total.value = response.total; tableLoading.value = false; - // response.data.forEach(element => { - // console.log(element.filelist, 'element'); - // element.filelist.forEach(urlimg => { - // allData.a = urlimg.url; - // console.log(allData.a, 'urlimg'); - // }); - // }); }); } diff --git a/src/layout/components/HeaderSys/index.vue b/src/layout/components/HeaderSys/index.vue index d26f548..477237b 100644 --- a/src/layout/components/HeaderSys/index.vue +++ b/src/layout/components/HeaderSys/index.vue @@ -12,6 +12,13 @@ {{ item.title }}

+ +
+ + + +
+
@@ -42,6 +49,11 @@ + + + + + @@ -51,7 +63,9 @@ import useAppStore from '@/store/modules/app'; import useUserStore from '@/store/modules/user'; import UserCenter from '@/views/system/user/profile/index'; //个人中心 +import newsDiaLOG from '@/views/system/user/profile/newsDiaLOG'; //消息通知 import userImg from '@/assets/images/login/user.png'; //默认头像 +import xiaoxi from '@/assets/images/login/xiaoxi_icon.png'; import bus from '@/utils/mitt'; import { ElMessageBox } from 'element-plus'; import usePermissionStore from '@/store/modules/permission'; @@ -59,6 +73,7 @@ const permissionStore = usePermissionStore(); const { proxy } = getCurrentInstance(); const dialogShow = ref(false); +const dialogNews = ref(false); const appStore = useAppStore(); const userStore = useUserStore(); const menuList = ref([]); @@ -119,6 +134,12 @@ localStorage.setItem('routerPartXG', 'Project'); //默认加载项目首页 } +// 消息弹框 +function goNews() { + console.log('123'); + dialogNews.value = true; +} + onMounted(() => { // 动态获取路由返回子菜单 permissionStore.sidebarRouters.map(item => { @@ -161,8 +182,20 @@ font-size: 28px; } } + .goNews { + width: 29px; + height: 29px; + text-align: center; + padding-right: 8px; + cursor: pointer; + img { + width: 22px; + height: 22px; + margin-top: 4px; + } + } .headerMenu { - width: 1500px; + width: 1400px; height: 100%; display: flex; align-items: center; @@ -192,7 +225,6 @@ height: 100%; display: flex; align-items: center; - &:focus { outline: none; } diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue index dd4a428..d863a89 100644 --- a/src/views/publicService/publicmind.vue +++ b/src/views/publicService/publicmind.vue @@ -27,14 +27,15 @@ @@ -63,7 +64,6 @@ const showSearch = ref(true); const allData = reactive({ - a: '', queryParams: { pageNum: 1, pageSize: 10, @@ -80,13 +80,6 @@ tableData.value = response.data; total.value = response.total; tableLoading.value = false; - // response.data.forEach(element => { - // console.log(element.filelist, 'element'); - // element.filelist.forEach(urlimg => { - // allData.a = urlimg.url; - // console.log(allData.a, 'urlimg'); - // }); - // }); }); } diff --git a/src/views/sponeScreen/longYW/PublicAdvice.vue b/src/views/sponeScreen/longYW/PublicAdvice.vue index ee65d0d..192f9b1 100644 --- a/src/views/sponeScreen/longYW/PublicAdvice.vue +++ b/src/views/sponeScreen/longYW/PublicAdvice.vue @@ -1,21 +1,21 @@ @@ -51,7 +63,9 @@ import useAppStore from '@/store/modules/app'; import useUserStore from '@/store/modules/user'; import UserCenter from '@/views/system/user/profile/index'; //个人中心 +import newsDiaLOG from '@/views/system/user/profile/newsDiaLOG'; //消息通知 import userImg from '@/assets/images/login/user.png'; //默认头像 +import xiaoxi from '@/assets/images/login/xiaoxi_icon.png'; import bus from '@/utils/mitt'; import { ElMessageBox } from 'element-plus'; import usePermissionStore from '@/store/modules/permission'; @@ -59,6 +73,7 @@ const permissionStore = usePermissionStore(); const { proxy } = getCurrentInstance(); const dialogShow = ref(false); +const dialogNews = ref(false); const appStore = useAppStore(); const userStore = useUserStore(); const menuList = ref([]); @@ -119,6 +134,12 @@ localStorage.setItem('routerPartXG', 'Project'); //默认加载项目首页 } +// 消息弹框 +function goNews() { + console.log('123'); + dialogNews.value = true; +} + onMounted(() => { // 动态获取路由返回子菜单 permissionStore.sidebarRouters.map(item => { @@ -161,8 +182,20 @@ font-size: 28px; } } + .goNews { + width: 29px; + height: 29px; + text-align: center; + padding-right: 8px; + cursor: pointer; + img { + width: 22px; + height: 22px; + margin-top: 4px; + } + } .headerMenu { - width: 1500px; + width: 1400px; height: 100%; display: flex; align-items: center; @@ -192,7 +225,6 @@ height: 100%; display: flex; align-items: center; - &:focus { outline: none; } diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue index dd4a428..d863a89 100644 --- a/src/views/publicService/publicmind.vue +++ b/src/views/publicService/publicmind.vue @@ -27,14 +27,15 @@ @@ -63,7 +64,6 @@ const showSearch = ref(true); const allData = reactive({ - a: '', queryParams: { pageNum: 1, pageSize: 10, @@ -80,13 +80,6 @@ tableData.value = response.data; total.value = response.total; tableLoading.value = false; - // response.data.forEach(element => { - // console.log(element.filelist, 'element'); - // element.filelist.forEach(urlimg => { - // allData.a = urlimg.url; - // console.log(allData.a, 'urlimg'); - // }); - // }); }); } diff --git a/src/views/sponeScreen/longYW/PublicAdvice.vue b/src/views/sponeScreen/longYW/PublicAdvice.vue index ee65d0d..192f9b1 100644 --- a/src/views/sponeScreen/longYW/PublicAdvice.vue +++ b/src/views/sponeScreen/longYW/PublicAdvice.vue @@ -1,21 +1,21 @@ @@ -51,7 +63,9 @@ import useAppStore from '@/store/modules/app'; import useUserStore from '@/store/modules/user'; import UserCenter from '@/views/system/user/profile/index'; //个人中心 +import newsDiaLOG from '@/views/system/user/profile/newsDiaLOG'; //消息通知 import userImg from '@/assets/images/login/user.png'; //默认头像 +import xiaoxi from '@/assets/images/login/xiaoxi_icon.png'; import bus from '@/utils/mitt'; import { ElMessageBox } from 'element-plus'; import usePermissionStore from '@/store/modules/permission'; @@ -59,6 +73,7 @@ const permissionStore = usePermissionStore(); const { proxy } = getCurrentInstance(); const dialogShow = ref(false); +const dialogNews = ref(false); const appStore = useAppStore(); const userStore = useUserStore(); const menuList = ref([]); @@ -119,6 +134,12 @@ localStorage.setItem('routerPartXG', 'Project'); //默认加载项目首页 } +// 消息弹框 +function goNews() { + console.log('123'); + dialogNews.value = true; +} + onMounted(() => { // 动态获取路由返回子菜单 permissionStore.sidebarRouters.map(item => { @@ -161,8 +182,20 @@ font-size: 28px; } } + .goNews { + width: 29px; + height: 29px; + text-align: center; + padding-right: 8px; + cursor: pointer; + img { + width: 22px; + height: 22px; + margin-top: 4px; + } + } .headerMenu { - width: 1500px; + width: 1400px; height: 100%; display: flex; align-items: center; @@ -192,7 +225,6 @@ height: 100%; display: flex; align-items: center; - &:focus { outline: none; } diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue index dd4a428..d863a89 100644 --- a/src/views/publicService/publicmind.vue +++ b/src/views/publicService/publicmind.vue @@ -27,14 +27,15 @@ @@ -63,7 +64,6 @@ const showSearch = ref(true); const allData = reactive({ - a: '', queryParams: { pageNum: 1, pageSize: 10, @@ -80,13 +80,6 @@ tableData.value = response.data; total.value = response.total; tableLoading.value = false; - // response.data.forEach(element => { - // console.log(element.filelist, 'element'); - // element.filelist.forEach(urlimg => { - // allData.a = urlimg.url; - // console.log(allData.a, 'urlimg'); - // }); - // }); }); } diff --git a/src/views/sponeScreen/longYW/PublicAdvice.vue b/src/views/sponeScreen/longYW/PublicAdvice.vue index ee65d0d..192f9b1 100644 --- a/src/views/sponeScreen/longYW/PublicAdvice.vue +++ b/src/views/sponeScreen/longYW/PublicAdvice.vue @@ -1,21 +1,21 @@ @@ -51,7 +63,9 @@ import useAppStore from '@/store/modules/app'; import useUserStore from '@/store/modules/user'; import UserCenter from '@/views/system/user/profile/index'; //个人中心 +import newsDiaLOG from '@/views/system/user/profile/newsDiaLOG'; //消息通知 import userImg from '@/assets/images/login/user.png'; //默认头像 +import xiaoxi from '@/assets/images/login/xiaoxi_icon.png'; import bus from '@/utils/mitt'; import { ElMessageBox } from 'element-plus'; import usePermissionStore from '@/store/modules/permission'; @@ -59,6 +73,7 @@ const permissionStore = usePermissionStore(); const { proxy } = getCurrentInstance(); const dialogShow = ref(false); +const dialogNews = ref(false); const appStore = useAppStore(); const userStore = useUserStore(); const menuList = ref([]); @@ -119,6 +134,12 @@ localStorage.setItem('routerPartXG', 'Project'); //默认加载项目首页 } +// 消息弹框 +function goNews() { + console.log('123'); + dialogNews.value = true; +} + onMounted(() => { // 动态获取路由返回子菜单 permissionStore.sidebarRouters.map(item => { @@ -161,8 +182,20 @@ font-size: 28px; } } + .goNews { + width: 29px; + height: 29px; + text-align: center; + padding-right: 8px; + cursor: pointer; + img { + width: 22px; + height: 22px; + margin-top: 4px; + } + } .headerMenu { - width: 1500px; + width: 1400px; height: 100%; display: flex; align-items: center; @@ -192,7 +225,6 @@ height: 100%; display: flex; align-items: center; - &:focus { outline: none; } diff --git a/src/views/publicService/publicmind.vue b/src/views/publicService/publicmind.vue index dd4a428..d863a89 100644 --- a/src/views/publicService/publicmind.vue +++ b/src/views/publicService/publicmind.vue @@ -27,14 +27,15 @@ @@ -63,7 +64,6 @@ const showSearch = ref(true); const allData = reactive({ - a: '', queryParams: { pageNum: 1, pageSize: 10, @@ -80,13 +80,6 @@ tableData.value = response.data; total.value = response.total; tableLoading.value = false; - // response.data.forEach(element => { - // console.log(element.filelist, 'element'); - // element.filelist.forEach(urlimg => { - // allData.a = urlimg.url; - // console.log(allData.a, 'urlimg'); - // }); - // }); }); } diff --git a/src/views/sponeScreen/longYW/PublicAdvice.vue b/src/views/sponeScreen/longYW/PublicAdvice.vue index ee65d0d..192f9b1 100644 --- a/src/views/sponeScreen/longYW/PublicAdvice.vue +++ b/src/views/sponeScreen/longYW/PublicAdvice.vue @@ -1,21 +1,21 @@