Merge branch 'dev_zyh' of United_Software/k_online_ui into dev

package.json

@@ -47,7 +47,7 @@
     "vue3-virtual-scroller": "^0.2.3",
     "vuedraggable": "^2.24.3",
     "vxe-pc-ui": "^4.1.7",
-    "vxe-table": "^4.13.15",
+    "vxe-table": "^4.7.70",
     "vxe-table-plugin-export-xlsx": "^4.0.5",
     "xe-clipboard": "^1.10.2",
     "xlsx": "^0.18.5"

src/components/AddRules/src/AddRules.vue

@@ -433,7 +433,7 @@ const Savesubscribe = () => {
       ConMethodsList.value.length == 0
     ) {
       if (ContainerOceanList.value.length == 0) {
-        missingmessage.value += 'Container Stutus, '
+        missingmessage.value += 'Container Status, '
       }
       if (ConFrequencyList.value.length == 0) {
         missingmessage.value += 'Notification Frequency, '

src/components/CreateAddRules/src/CreateAddRules.vue

@@ -683,7 +683,7 @@ const Savesubscribe = () => {
         missingmessage.value += 'Time, '
       }
       if (ContainerOceanList.value.length == 0) {
-        missingmessage.value += 'Container Stutus, '
+        missingmessage.value += 'Container Status, '
       }
       if (ConFrequencyList.value.length == 0) {
         missingmessage.value += 'Notification Frequency, '

src/components/TransportMode/src/TransportMode.vue

@@ -141,15 +141,17 @@ const defaultTransport = () => {
       } else {
         searchTableQeuryTracking.value =
           JSON.parse(sessionStorage.getItem('searchTableQeuryTracking') as string) || {}
-        if (searchTableQeuryTracking.value.transport_mode.length !== 0) {
-          TransportData.data = searchTableQeuryTracking.value.transport_mode
-          searchTableQeuryTracking.value.transport_mode.forEach((item: any) => {
-            if (item == 'All') {
-              checkAll.value = true
-            } else {
-              checkAll.value = false
-            }
-          })
+        if (searchTableQeuryTracking.value.transport_mode != undefined) {
+          if (searchTableQeuryTracking.value.transport_mode.length !== 0) {
+            TransportData.data = searchTableQeuryTracking.value.transport_mode
+            searchTableQeuryTracking.value.transport_mode.forEach((item: any) => {
+              if (item == 'All') {
+                checkAll.value = true
+              } else {
+                checkAll.value = false
+              }
+            })
+          }
         } else {
           TransportData.data = []
           checkAll.value = false
@@ -180,15 +182,17 @@ const defaultTransport = () => {
     } else {
       searchTableQeury.value =
         JSON.parse(sessionStorage.getItem('searchTableQeury') as string) || {}
-      if (searchTableQeury.value.transport_mode.length !== 0) {
-        TransportData.data = searchTableQeury.value.transport_mode
-        searchTableQeury.value.transport_mode.forEach((item: any) => {
-          if (item == 'All') {
-            checkAll.value = true
-          } else {
-            checkAll.value = false
-          }
-        })
+      if (searchTableQeury.value.transport_mode !== undefined) {
+        if (searchTableQeury.value.transport_mode.length !== 0) {
+          TransportData.data = searchTableQeury.value.transport_mode
+          searchTableQeury.value.transport_mode.forEach((item: any) => {
+            if (item == 'All') {
+              checkAll.value = true
+            } else {
+              checkAll.value = false
+            }
+          })
+        }
       } else {
         TransportData.data = []
         checkAll.value = false

src/styles/vxeTable.scss

@@ -161,3 +161,7 @@ div.vxe-table--context-menu-wrapper {
     }
   }
 }
+
+.vxe-tooltip--content {
+  color: #f0f1f3;
+}

src/views/AIApiLog/src/AIApiLog.vue

@@ -179,7 +179,6 @@ const DateChange = (date: any) => {
   margin-right: 8px;
 }
 .dashboard {
-  z-index: 2014;
   position: relative;
   background-color: var(--color-mode);
 }

src/views/AIApiLog/src/components/TableView/src/TableView.vue

@@ -22,7 +22,8 @@ const handleColumns = (columns: any, status?: string) => {
       title: item.title,
       field: item.field,
       sortable: true,
-      minWidth: 120
+      minWidth: 120,
+      showOverflow: true
     }
     // 设置插槽
     if (item.type === 'status' && status !== 'all') {
@@ -64,7 +65,7 @@ const getTableColumns = async () => {
       tableData.value.columns = [
         { type: 'checkbox', width: 50, fixed: 'left' },
         ...handleColumns(res.data.OperationTableColumns),
-        { title: 'Action', width: 102, fixed: 'right', slots: { default: 'action' } }
+        { title: 'Action', width: 106, fixed: 'right', slots: { default: 'action' } }
       ]
       tableOriginColumnsField.value = res.data.OperationTableColumns
     }
@@ -160,7 +161,6 @@ const tableData = ref<VxeGridProps<any>>({
   columns: [],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,
@@ -379,7 +379,7 @@ defineExpose({
       <!-- action操作栏的插槽 -->
       <template #action="{ row }">
         <el-button
-          style="height: 24px; padding: 8px 4px; font-size: 12px"
+          style="height: 24px; padding: 8px 4px; padding-left: 5px; font-size: 12px"
           @click="handleLogDetail(row)"
         >
           <span

src/views/AIRobotChat/src/AIRobotChat.vue

@@ -581,17 +581,17 @@ defineExpose({
       width: 32px;
       border-radius: 50%;
       // background-color: #f5f4f4;
-      background: rgba(255, 255, 255, 0.1); /* 半透明背景色 */
+      background: rgba(255, 255, 255, 0.6); /* 半透明背景色 */
       box-shadow: 2px 2px 12px 0px rgba(0, 0, 0, 0.3);
-      backdrop-filter: blur(1.5px); /* 应用10px的模糊效果 */
+      backdrop-filter: blur(1px); /* 应用10px的模糊效果 */
       span {
         color: #2b2f36;
       }
       cursor: pointer;
       &:hover {
-        background-color: var(--color-theme);
+        background-color: #fceee3;
         span {
-          color: #fff;
+          color: var(--color-theme);
         }
       }
     }

src/views/Booking/src/BookingView.vue

@@ -89,7 +89,7 @@ const FiltersSeach = (val: any, value: any) => {
 //TransportSearch
 const TransportSearch = (val: any) => {
   filterData.transportData = []
-  if (val.data) {
+  if (val.data.length != 0) {
     let str = `${val.title}:${val.data}`
     filterData.transportData.push(str)
   }
@@ -99,7 +99,7 @@ const TransportSearch = (val: any) => {
 // defaultTransport
 const defaultTransport = (val: any, value: any) => {
   filterData.transportData = []
-  if (val.data) {
+  if (val.data.length != 0) {
     let str = `${val.title}:${val.data}`
     filterData.transportData.push(str)
   }

src/views/Booking/src/components/BookingDetail/src/components/AddReferenceDialog.vue

@@ -45,7 +45,6 @@ const tableData = ref<VxeGridProps<any>>({
   ],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,

src/views/Booking/src/components/BookingDetail/src/components/ContainersView.vue

@@ -15,7 +15,6 @@ const tableData = ref<VxeGridProps<any>>({
   columns: [],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,

src/views/Booking/src/components/BookingTable/src/BookingTable.vue

@@ -188,7 +188,6 @@ const bookingTable = ref<VxeGridProps<any>>({
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 20, scrollToTopOnChange: true },
   scrollX: { enabled: true, gt: 10, scrollToLeftOnChange: true },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,

src/views/ChatLog/src/ChatLog.vue

@@ -258,7 +258,6 @@ const openDialog = () => {
   margin-right: 8px;
 }
 .dashboard {
-  z-index: 2014;
   position: relative;
   background-color: var(--color-mode);
 }

src/views/ChatLog/src/components/TableView/src/TableView.vue

@@ -158,7 +158,6 @@ const tableData = ref<VxeGridProps<any>>({
   columns: [],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,

src/views/Layout/src/components/Menu/MenuView.vue

@@ -10,64 +10,7 @@ const userStore = useUserStore()
 
 const isCollapse = defineModel<boolean>()
 
-const menuList = ref([
-  {
-    index: '1',
-    label: 'Dashboard',
-    icon: 'icon_data_fill_b',
-    path: '/dashboard'
-  },
-  {
-    index: '2',
-    label: 'Booking',
-    icon: 'icon_booking__fill_b',
-    path: '/booking'
-  },
-  {
-    index: '3',
-    label: 'Tracking',
-    icon: 'icon_tracking__fill_b',
-    path: '/tracking'
-  },
-  {
-    index: '4',
-    label: 'System Management',
-    icon: 'icon_system__management_fill_b',
-    type: 'list',
-    children: [
-      {
-        index: '4-1',
-        label: 'System Message',
-        path: '/system-message'
-      },
-      {
-        index: '4-2',
-        label: 'System Settings',
-        path: '/SystemSettings'
-      },
-      {
-        index: '4-3',
-        label: 'Operation Log',
-        path: '/Operationlog'
-      },
-      {
-        index: '4-4',
-        label: 'Chat Log',
-        path: '/chat-log'
-      },
-      {
-        index: '4-5',
-        label: 'AI API Log',
-        path: '/ai-api-log'
-      },
-      {
-        index: '4-6',
-        label: 'Prompt Configuration',
-        path: '/PromptConfiguration'
-      }
-    ]
-  }
-])
+const menuList = ref()
 watch(
   () => userStore.userInfo?.uname,
   () => {
@@ -81,7 +24,7 @@ const getMenuList = () => {
     }
   })
 }
-// getMenuList()
+getMenuList()
 //监听窗口大小
 const handler = () => {
   return (() => {
@@ -134,10 +77,10 @@ router.afterEach(() => {
 
 // 路由跳转函数
 const changeRouter = (path: any) => {
-  if(path == '/PromptConfiguration') {
-    emitter.emit('checkPrompt');
+  if (path == '/PromptConfiguration') {
+    emitter.emit('checkPrompt')
   } else {
-    emitter.emit('checknoPrompt');
+    emitter.emit('checknoPrompt')
   }
   if (sessionStorage.getItem('searchTableQeury')) {
     sessionStorage.removeItem('searchTableQeury')

src/views/Tracking/src/TrackingView.vue

@@ -154,7 +154,7 @@ const FiltersSeach = (val: any, value: any) => {
 //TransportSearch
 const TransportSearch = (val: any) => {
   filterData.transportData = []
-  if (val.data) {
+  if (val.data.length != 0) {
     let str = `${val.title}:${val.data}`
     filterData.transportData.push(str)
   }
@@ -164,7 +164,7 @@ const TransportSearch = (val: any) => {
 // defaultTransport
 const defaultTransport = (val: any, value: any) => {
   filterData.transportData = []
-  if (val.data) {
+  if (val.data.length !=0) {
     let str = `${val.title}:${val.data}`
     filterData.transportData.push(str)
   }

src/views/Tracking/src/components/PublicTracking/src/components/MilestonesTable.vue

@@ -18,7 +18,6 @@ const tableData = ref<VxeGridProps<any>>({
   columns: [],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,

src/views/Tracking/src/components/TrackingDetail/src/components/AMS&ISF.vue

@@ -73,7 +73,6 @@ const AMSTableData = ref<VxeGridProps<any>>({
   columns: [],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,
@@ -105,7 +104,6 @@ const ISFTableData = ref<VxeGridProps<any>>({
   columns: [],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,

src/views/Tracking/src/components/TrackingDetail/src/components/AddReferenceDialog.vue

@@ -45,7 +45,6 @@ const tableData = ref<VxeGridProps<any>>({
   ],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,

src/views/Tracking/src/components/TrackingDetail/src/components/AttachmentView.vue

@@ -15,7 +15,6 @@ const tableData = ref<VxeGridProps<any>>({
   columns: [],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,

src/views/Tracking/src/components/TrackingDetail/src/components/ContainersView.vue

@@ -15,7 +15,6 @@ const tableData = ref<VxeGridProps<any>>({
   columns: [],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,

src/views/Tracking/src/components/TrackingDetail/src/components/MilestonesTable.vue

@@ -16,7 +16,6 @@ const tableData = ref<VxeGridProps<any>>({
   columns: [],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -262,7 +262,6 @@ const trackingTable = ref<any>({
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 20, scrollToTopOnChange: true },
   scrollX: { enabled: true, gt: 2, scrollToLeftOnChange: true },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,

src/views/Tracking/src/components/TrackingTable/src/components/VGMView.vue

@@ -66,7 +66,6 @@ const tableData = ref<VxeGridProps<any>>({
   columns: [],
   data: [],
   scrollY: { enabled: true, oSize: 20, gt: 30 },
-  stripe: true,
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,