ソースを参照

消息管理添加已读功能,修改部分细节

凉纪 2 年 前
コミット
f68b463ea3

+ 2 - 1
src/views/menu/NFCmanage/index.vue

@@ -98,8 +98,9 @@ export default {
       //alert(data)
       this.nfcMsg = '读取中...';
       if(!data) {
-        this.$toast('扫描失败');
+        this.$toast('扫描失败,请重试');
         //this.showPopup = false;
+        this.nfcMsg = '将NFC贴至手机背部';
         return
       }
       let code = JSON.parse(data).content;

+ 8 - 3
src/views/menu/message/api.js

@@ -1,5 +1,4 @@
 import request from "@/utils/request";
-import day from 'dayjs'
 //获取消息列表
 export function dataList(params) {
   return request({
@@ -16,6 +15,12 @@ export function msgList(data){
     data
   });
 }
-
-
+//设置已读接口
+export function setRead(data){
+  return request({
+    url: "/core/notification/markIsRead",
+    method: "post",
+    data
+  });
+}
 

+ 13 - 9
src/views/menu/message/index.vue

@@ -16,7 +16,7 @@
         <card class="list-item" v-else v-for="(v,i) in dataList" :key="i">
           <van-cell :title="v.title" :label="v.content" @click="clickItem(v)">
             <template #right-icon>
-              <i  class="point-icon" :class="{'active':v.isRead}" />
+              <i  class="point-icon" :class="{'active':!v.isRead}" />
             </template>
             <template #label>
               <div class="cell-label">
@@ -62,7 +62,7 @@
 
 <script>
 import Scroll from '@/components/scroll/scroll'
-import {msgList,dataList} from './api'
+import {msgList,dataList,setRead} from './api'
 import {mapGetters} from "vuex"
 
 export default {
@@ -98,14 +98,18 @@ export default {
       this.show = false;
     },
     clickItem(v){
-      if(v.fileList && v.fileList.length > 0){
-        v.fileList.forEach(v=>{
-          //p:获取url中的后缀名
-          let p = v.url.split('.');
-          console.log(p,'pppppppp')
-          //v.type = url.
-        })
+      let data = {
+        announcementNotificationId:v.id,
+        orgId:this.orgId,
+        userId:this.id,
       }
+      setRead(data).then(res=>{
+        this.dataList.forEach(item=>{
+          if(item.id === v.id){
+            item.isRead = true;
+          }
+        })
+      })
       this.selected = v;
       this.show = true;
     },

+ 4 - 4
src/views/menu/securityCheckRegister/detail.vue

@@ -249,10 +249,10 @@ export default {
             this.$toast.fail('NFC点位:' + v.nfcName + '已扫描,请勿重复扫描!');
             throw new Error('NFC点位:' + v.nfcName + '已扫描,请勿重复扫描!');
           }
-          v.status = 1
-          v.scanMethod = 2
-          v.submitTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-          v.submitBy = this.id
+          v.status = 1;
+          v.scanMethod = 0;
+          v.submitTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
+          v.submitBy = this.id;
           this.$toast.success('NFC点位:' + v.nfcName + '扫描成功!');
           checkOk = true;
         }

+ 1 - 3
vue.config.js

@@ -110,9 +110,7 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
-        // target: "http://10.87.10.55:8080",
-        target: "http://10.87.10.91:8080",
-        // target: "http://10.87.11.173:8080",
+        target: "http://10.87.10.55:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{