Parcourir la source

fix: update message

hi-cactus! il y a 3 ans
Parent
commit
ade88a0d1d

+ 1 - 0
src/constants/constants.ts

@@ -1,2 +1,3 @@
 export const BaseMediaUrl = 'http://sqfile.xt.wenhq.top:8083';
 export const BaseLoginUrl = 'http://61.147.254.211:9999/home/#/login'
+export const BaseReg = /^\+\+\+\+[\.]+|[\d|\w|\s|\u4e00-\u9fa5]+\+\+\+\+$/;

+ 5 - 4
src/views/IncidentDetail/ExecutionLogCard/index.tsx

@@ -3,6 +3,7 @@ import { useIncidentStore } from '@/store';
 import clsx from 'clsx';
 import { computed, defineComponent, ref } from 'vue-demi';
 import { Management } from '@element-plus/icons';
+import { BaseReg } from '@/constants/constants';
 export default defineComponent({
   name: 'ExecutionLogCard',
   setup(props) {
@@ -20,9 +21,9 @@ export default defineComponent({
           {store.incidentDetail?.process?.map((item, idx) => (
             <div class={clsx('log-item', `log-item-${idx % 4}`)}>
               <span class="log-label">
-                {item.des?.includes('++++') ? (
+                {item.des?.includes('>>>>') ? (
                   <>
-                    <span>{item.des.split('++++')[0]}</span>
+                    <span>{item.des.split('>>>>')[0]}</span>
                     <span>
                       <span
                         style={{
@@ -32,12 +33,12 @@ export default defineComponent({
                           whiteSpace: 'nowrap',
                           width: '75%',
                         }}>
-                        {item.des.split('++++')[1]}
+                        {item.des.split('>>>>')[1]}
                       </span>
                       {
                         <span style={{ color: '#00d0ff' }}>
-                          {item.des.split('++++')[1]?.length ?? 0}
+                          {item.des.split('>>>>')[1]?.split(',')?.length ?? 0}
                         </span>
                       }
                       人未读

+ 4 - 0
src/views/IncidentDetail/index.scss

@@ -369,6 +369,7 @@
             position: absolute;
             left: 0;
             & > span {
+              justify-content: right;
               display: flex;
               overflow: hidden;
 
@@ -430,6 +431,9 @@
               left: unset;
               right: 0;
               text-align: left;
+              &>span{
+                justify-content: left;
+              }
             }
             .log-time {
               left: unset;

+ 6 - 3
src/views/IncidentDetail/index.tsx

@@ -18,6 +18,7 @@ import { watch } from 'fs';
 import { isEmpty } from 'lodash';
 import isString from 'lodash/isString';
 import { NeedsReadUser, NeedsReadUserName } from '@/api/common';
+import { BaseReg } from "@/constants/constants";
 
 export default defineComponent({
   name: 'IncidentDetail',
@@ -34,7 +35,7 @@ export default defineComponent({
     watchEffect(() => {
       const messageIDs =
         store.incidentDetail?.process
-          ?.map((item) => (item.des === '发送消息' ? item.id : null))
+          ?.map((item) => (item.des?.match(BaseReg) ? item.id : null))
           .filter(isString) ?? [];
       if (messageIDs.length > 0) {
         Promise.all(
@@ -55,8 +56,10 @@ export default defineComponent({
               if (idx && idx >= 0) {
                 // @ts-ignore
                 store.incidentDetail.process[idx].des =
-                  m.msText?.split('事件的')[1] +
-                  '++++' +
+                  // @ts-ignore
+                  (store.incidentDetail.process[idx].des.replace(/\+\+\+\+/g,'') ??
+                    '') +
+                  '>>>>' +
                   NeedsReadUserName.map((user) => user).join(',');
                 // (m.messageReadInfoList
                 //   ?.map((user) =>