Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

.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"]]

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 .

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="
                                             () => {
+                                                if(it.isRead==undefined || it.isRead != 1){
                                                     it.isRead = 1;
                                                     setReadSingle(it.id, item.key);
+                                                }
                                                 goToRouter(it);
                                             }
                                         "
@@ -100,9 +102,11 @@
                                         :class="it.read ? 'readed' : ''"
                                         @click="
                                             () => {
+                                                if(it.read==undefined || it.read != 1){
                                                     it.read = 1;
                                                     setReadSingle(it.id, item.key, it);
                                                 }
+                                            }
                                         "
                                     >
                                         <span class="list-item-title">
@@ -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 

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}= (()=>{

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';
 
 /**
  * 主题样式