songxy 1 gadu atpakaļ
vecāks
revīzija
3e9a45a684

+ 1 - 1
client/src/views/OaSystem/officeCenter/noticeAndLearn/noticeLook.vue

@@ -114,7 +114,7 @@ const queryCount = async (): Promise<void> => {
     type: 1,
     ...formData.value
   }
-  const result = await request.get({ url: urlApi, data: sendData })
+  const result = await request.get({ url: urlApi, params: sendData })
   console.log('result--------------')
   console.log(result)
 }

+ 1 - 1
client_h5/.env.dev

@@ -1,4 +1,4 @@
-VITE_BASE_URL='http://oa.zjugis.com:28080/'
+VITE_BASE_URL='http://10.10.10.7:18080'
 # VITE_BASE_URL='http://localhost:6090/'
 
 

+ 4 - 4
client_h5/src/pages/home/index.vue

@@ -70,7 +70,7 @@ const processMenus: ProcessMenuItem[] = [
   },
 ];
 
-const personMenus: MenuItem[] = [
+const personMenus = reactive<MenuItem[]>([
   {
     title: "我的资产",
     path: "assetMy",
@@ -82,7 +82,7 @@ const personMenus: MenuItem[] = [
     icon: "../assets/images/tzgg_icon.png",
     corner: 0
   },
-];
+]);
 const router = useRouter();
 /***
  * 根据用户ID获取待办角标
@@ -100,7 +100,7 @@ initAttendCount()
  * 获取通知公告角标
  */
  async function queryNoticeAndLearnCount() {
-  const urlApi = `/admin-api/adm/noticeAndLearn/readNo/count`
+  const urlApi = `/admin-api/adm/noticeAndLearn/readNo/count?type=1`
    const result = await request.get(urlApi)
    personMenus[1]['corner'] = result?.data
 }
@@ -174,7 +174,7 @@ const getAssetURL = (image: string) => {
           >
             <img :src="getAssetsURI(item['icon'])" />
             <span class="title">{{ item["title"] }}</span>
-            <span class="corner" v-if="item['corner']">{{
+            <span class="corner" v-if="item['corner'] > 0">{{
               item["corner"]
             }}</span>
           </li>

+ 3 - 0
client_h5/src/pages/notice/index.scss

@@ -6,6 +6,9 @@
       background-color: #fff;
       padding: 15px;
       margin-bottom: 10px;
+      &.read {
+        color: #777;
+      }
       >.desc {
         font-size: 16px;
         margin: 6px 0px;

+ 1 - 1
client_h5/src/pages/notice/index.vue

@@ -19,7 +19,7 @@
               finished-text="没有更多了"
               @load="onLoad"
             >
-              <div class="handlecenter_card" v-for="(item,index) in noticeLists" :key="index" @click="clickHandler(item, false)">
+              <div v-for="(item,index) in noticeLists" :key="index" @click="clickHandler(item, false)" :class="{ handlecenter_card: true, read: item.readState }">
                 <div class="desc">{{item['title']??'暂无标题'}}</div>
                 <div class="tip">
                   <div>

+ 0 - 2
client_h5/src/utils/common.ts

@@ -70,10 +70,8 @@ export const formatDateTime = (date: Date) => {
  * 格式化时间
  */
 export const formatDateTimeByTime = (time: number) => {
-  console.log('1233')
   const date = new Date();
   date.setTime(time);
-  console.log(formatDateTime(date))
   return formatDateTime(date);
 }