diff --git a/.env.development b/.env.development index f8e66ec..4d5b2a6 100644 --- a/.env.development +++ b/.env.development @@ -11,7 +11,7 @@ VITE_PUBLIC_PATH = / # 可以有多个,注意多个不能换行,否则代理将会失效 #VITE_PROXY = [["/api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]] #VITE_PROXY=[["/api/workflow","http://10.0.0.2:8093/workflow/"],["/api","http://10.10.2.102:9500"]] -VITE_PROXY=[["/api","http://10.10.2.102:9500"]] +VITE_PROXY=[["/api/magic-api/","http://127.0.0.1:8097/magic-api/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/approve/","http://127.0.0.1:8096","/approve/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/system/generator/","http://127.0.0.1:8091/system/generator/"],["/api/system/file/","http://127.0.0.1:8091/system/file/"],["/api/system/oss/","http://127.0.0.1:8091/system/oss/"],["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] #VITE_PROXY=[["/api/sales/","http://127.0.0.1:8096","/sales/"],["/api/mdm/","http://127.0.0.1:8096","/mdm/"],["/api","http://10.10.2.102:9500"]] diff --git a/Dockerfile b/Dockerfile index a43b879..cd6f8a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,4 +15,4 @@ VOLUME ["/etc/nginx/nginx.conf", "/usr/share/nginx/html"] CMD ["nginx","-g","daemon off;"] -# docker build -t docker.ges.bjgastx.com/itc-web:1.1.7 . +# docker build -t docker.ges.bjgastx.com/itc-web:1.1.9 . diff --git a/src/layouts/default/header/components/notify/index.vue b/src/layouts/default/header/components/notify/index.vue index 2084819..e36e95f 100644 --- a/src/layouts/default/header/components/notify/index.vue +++ b/src/layouts/default/header/components/notify/index.vue @@ -71,11 +71,13 @@ class="list-item readed-mark" v-for="it in item.list" :key="it.id" - :class="it.isRead === 1 ? 'readed' : ''" + :class="it.isRead == 1 ? 'readed' : ''" @click=" () => { - it.isRead = 1; - setReadSingle(it.id, item.key); + if(it.isRead==undefined || it.isRead != 1){ + it.isRead = 1; + setReadSingle(it.id, item.key); + } goToRouter(it); } " @@ -100,8 +102,10 @@ :class="it.read ? 'readed' : ''" @click=" () => { - it.read = 1; - setReadSingle(it.id, item.key, it); + if(it.read==undefined || it.read != 1){ + it.read = 1; + setReadSingle(it.id, item.key, it); + } } " > @@ -252,7 +256,7 @@ datetime: o.releaseTime, color: '', type: '3', - read: o.isRead, + read: o.readId!=null && o.readId!=undefined?1:0, }); }); let res1 = await getOaNews(2); @@ -267,7 +271,7 @@ datetime: o.releaseTime, color: '', type: '3', - read: o.isRead + read: o.readId!=null && o.readId!=undefined?1:0 }); }); let res2 = await getOaMessage(); @@ -372,7 +376,7 @@ listData.value[type - 1].unreadNum = 0; } async function setReadSingle(ids, num, record) { - console.log(num, 'num') + console.log(arguments) // if (num == 3) { // 日程 // await setScheduleRead([ids]); // } else diff --git a/src/layouts/default/setting/handler.ts b/src/layouts/default/setting/handler.ts index 8d54aa7..fb0e4d8 100644 --- a/src/layouts/default/setting/handler.ts +++ b/src/layouts/default/setting/handler.ts @@ -8,7 +8,6 @@ import { ProjectConfig } from '/#/config'; import { changeTheme } from '/@/logics/theme'; import { updateDarkTheme } from '/@/logics/theme/dark'; import { useRootSetting } from '/@/hooks/setting/useRootSetting'; -import { info } from 'console'; import { MenuThemeEnum,MenuThemeInfo } from '/@/enums/menuEnum'; const MENU_THEME:{[key:string]:MenuThemeInfo}= (()=>{ diff --git a/src/utils/theme.ts b/src/utils/theme.ts index 1bc1347..9ce3bf3 100644 --- a/src/utils/theme.ts +++ b/src/utils/theme.ts @@ -1,7 +1,5 @@ import { useAppStore } from '/@/store/modules/app'; import { changeTheme } from '/@/logics/theme'; -import { colorIsDark, lighten, darken } from '/@/utils/color'; -import { ThemeEnum } from '/@/enums/appEnum'; /** * 主题样式