Merge branch 'dev' of United_Software/k_online_ui into test

src/api/module/system.ts

@@ -143,4 +143,18 @@ export const EditMonitoringTable = (params: any, config: any) => {
     },
     config
   )
+}
+/**
+ * 第一次点击设置页面
+ */
+export const FirstInitSubscribe = (params: any, config: any) => {
+  return HttpAxios.post(
+    `${baseUrl}`,
+    {
+      action: 'system_setting',
+      operate: 'subscribe_notification_default_init',
+      ...params
+    },
+    config
+  )
 }

src/styles/theme.scss

@@ -92,6 +92,7 @@
   --color-btn-default-dark-hover: #ff7500;
   // main-plain
   --color-btn-main-plain-bg-hover: hsl(26, 100%, 95%);
+  --color-btn-action-bg-hover: rgba(255, 117, 0, 0.2);
   // main
   --color-btn-main-bg-hover: #d56200;
   --color-btn-main-bg-disabled: rgba(237, 109, 0, 0.3);
@@ -304,17 +305,17 @@
   --color-ai-user-bubble-bg-gradient-end: #f2f4f7;
   --input-border: #eaebed;
   --color-pause-btn-bg: #fff1e6;
-  --color-arrow-hoverL: #FCEEE3;
+  --color-arrow-hoverL: #fceee3;
 
-  --color-output-type-bg: #4361ED;
-  --color-output-type-string-bg: #6C757E;
-  --color-output-select-text: #F9A725;
+  --color-output-type-bg: #4361ed;
+  --color-output-type-string-bg: #6c757e;
+  --color-output-select-text: #f9a725;
   --color-loading-text: #b5b9bf;
   --color-warning-tips-bg: #fff4d1;
-  --color-prompt-preview-bg: #FCF7FF;
-  --color-prompt-diaolog-bg: #F8F9FD;
-  --color-prompt-disabled-bg: #F4F4F4;
-  --color-prompt-disabled-border: rgba(234, 235, 237, 0.30);
+  --color-prompt-preview-bg: #fcf7ff;
+  --color-prompt-diaolog-bg: #f8f9fd;
+  --color-prompt-disabled-bg: #f4f4f4;
+  --color-prompt-disabled-border: rgba(234, 235, 237, 0.3);
 }
 
 :root.dark {
@@ -499,4 +500,13 @@
   --color-loading-text: #818892;
   --color-warning-tips-bg: #85681b;
   --color-warning-tips-text: #edb82f;
+  div.markdown-body {
+    tr {
+      background-color: #30353c;
+    }
+    th,
+    td {
+      border-color: #3f434a;
+    }
+  }
 }

src/views/SystemSettings/src/SystemSettings.vue

@@ -4,6 +4,7 @@ import AddRSettingTableules from './components/SettingTable'
 import MonitoringTable from './components/MonitoringTable'
 import { useRouter, useRoute } from 'vue-router'
 import PersonalProfile from './components/PersonalProfile.vue'
+import moment from 'moment-timezone'
 
 const router = useRouter()
 const route = useRoute()
@@ -134,6 +135,22 @@ const SubShipmentsColumns = ref([
 const SubShipmentsTable = ref()
 const AddRulesTable = ref()
 const subscribeInit = ref({})
+
+const DefaultTimeZone = ref()
+const isInitSystem = JSON.parse(localStorage.getItem('userInfo')).subscribe_notification_default_init
+DefaultTimeZone.value = 'UTC' + moment().tz(moment.tz.guess()).format('Z')
+const FirstInitSubscribe = () => {
+  if(isInitSystem) {
+    $api.FirstInitSubscribe({
+      default_time_zone: DefaultTimeZone.value
+    }).then((res:any) => {
+      getsubscribe()
+    })
+  } else {
+    getsubscribe()
+  }
+}
+
 const getsubscribe = () => {
   $api.getsubscribe({}).then((res: any) => {
     if (res.code === 200) {
@@ -214,7 +231,7 @@ const gettabledatalength = (val: any) => {
 }
 
 onMounted(() => {
-  getsubscribe()
+  FirstInitSubscribe()
   if (sessionStorage.getItem('activeTab') != null) {
     TabActive.value = sessionStorage.getItem('activeTab')
     sessionStorage.removeItem('activeTab')

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

@@ -743,7 +743,7 @@ defineExpose({
     color: var(--color-theme);
   }
   &:hover {
-    background-color: var(--color-btn-main-plain-bg-hover);
+    background-color: var(--color-btn-action-bg-hover);
     fill: var(--color-theme);
     .Subscribe {
       color: var(--color-theme);