Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

src/layout/components/NavBarTop/index.vue

@@ -3,13 +3,13 @@
     <div class="rowBC">
       <div class="appNav-left">
         <el-avatar class="appNav-avatar" :size="25" :src="imgUrl" @error="errorHandler">
-          <img src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" />
+          <img src="../../../assets/home/pc_err.png" />
         </el-avatar>
         <span class="appNav-name">深圳机场货运一个码系统-管理端</span>
       </div>
       <div class="appNav-right">
         <el-avatar class="appNav-avatar" :size="25" :src="imgUrl" @error="errorHandler">
-          <img src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" />
+          <img src="../../../assets/home/pc_err.png" />
         </el-avatar>
         <el-dropdown trigger="click" size="default">
           <div class="avatar-wrapper">

src/views/login/Login.vue

@@ -4,7 +4,7 @@
     <el-form ref="refloginForm" class="login-form" :model="formInline" :rules="formRules">
       <div class="title-container rowSS">
         <el-avatar class="appNav-avatar" :size="36" :src="imgUrl" @error="errorHandler">
-          <img src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" />
+          <img src="../../assets/home/pc_err.png" />
         </el-avatar>
         <h3 class="title">{{ title }}</h3>
       </div>
@@ -38,6 +38,7 @@ import { ElMessage } from "element-plus";
 import { ObjTy } from "~/common";
 import { useUserStore } from "@/store/user";
 import MD5 from "blueimp-md5";
+import imgUrl from "@/assets/home/pic_logo.png";
 //element valid
 const formRules = useElement().formRules;
 //form
@@ -51,8 +52,7 @@ let state: ObjTy = reactive({
   otherQuery: {},
   redirect: undefined,
 });
-const title = ref("系统名称");
-const imgUrl = ref("https://cube.elemecdn.com/");
+const title = ref("深圳机场货运一个码系统");
 /* listen router change  */
 const route = useRoute();
 let getOtherQuery = (query: any) => {
@@ -81,10 +81,10 @@ onBeforeMount(() => {
 });
 
 const getToken = async () => {
-  const { code, returnData, message } = await gettoken({
+  const { code, returnData, message } = (await gettoken({
     appid: PLATFROM_CONFIG.appId,
     appSecret: PLATFROM_CONFIG.appKeyString,
-  });
+  })) as any;
   if (code == 0 && returnData) {
     setCodeToken(returnData.appToken);
     getCheckCode();
@@ -96,9 +96,9 @@ const getToken = async () => {
 
 //获取动态验证码
 const getCheckCode = async () => {
-  const { code, message, returnData } = await GetCheckCode({
+  const { code, message, returnData } = (await GetCheckCode({
     appToken: getCodeToken(),
-  });
+  })) as any;
   if (code == 0) {
     identifyCode.value = returnData;
   } else {
@@ -113,7 +113,7 @@ const changeCode = () => {
 
 //获取系统设置
 const getSystemSet = async () => {
-  const { code, message } = await GetSystemSet({});
+  const { code, message } = (await GetSystemSet({})) as any;
   if (code == 0) {
     ElMessage.success(message);
   } else {

src/views/realTime/components/WaybillView/index.vue

@@ -136,7 +136,7 @@ const { trackAirlines, trackBoxStyle } = useTrackData(props.name, trackData)
 const tableData = computed(() =>
   trackData.value.reduce((data, current) => {
     const sameRow = data.find(row =>
-      ['stockCode', 'flightNO', 'flightDate', 'ULDNO', 'CargoSN'].every(
+      ['stockCode', 'flightNO', 'flightDate', 'CargoSN'].every(
         key => row[key] === current[key]
       )
     )
@@ -163,6 +163,25 @@ const tableData = computed(() =>
     }\n${execTime ?? ''}`
     if (sameRow) {
       sameRow[String(nodeCode)] = nodeValue
+      ;[
+        'ULDNO',
+        // 'CargoSN'
+      ].forEach(key => {
+        const oldValue = sameRow[key]
+        const currentValue = current[key]
+        if (typeof currentValue === 'string' && currentValue !== oldValue) {
+          if (typeof oldValue === 'string') {
+            sameRow[key] = [
+              ...new Set([...oldValue.split(','), ...currentValue.split(',')]),
+            ].join(',')
+          } else {
+            sameRow[key] = currentValue
+          }
+        }
+      })
+      ;['pullMark', 'returnMark'].forEach(key => {
+        sameRow[key] = sameRow[key] ?? current[key]
+      })
     } else {
       data.push({
         ...current,