Merge branch 'master' into master_zyh

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

@@ -77,10 +77,17 @@ router.afterEach(() => {
 
 // 路由跳转函数
 const changeRouter = (path: any) => {
+  if (localStorage.getItem('loginAI')) {
+    localStorage.removeItem('loginAI')
+    emitter.emit('login-success')
+  }
   if (path == '/PromptConfiguration') {
     emitter.emit('checkPrompt')
   } else {
-    emitter.emit('checknoPrompt')
+    if (localStorage.getItem('loginAI')) {
+      localStorage.removeItem('loginAI')
+      emitter.emit('checknoPrompt')
+    }
   }
   if (sessionStorage.getItem('searchTableQeury')) {
     sessionStorage.removeItem('searchTableQeury')
@@ -95,10 +102,6 @@ const changeRouter = (path: any) => {
   }
   sessionStorage.removeItem('trackingTablePageInfo')
   sessionStorage.removeItem('bookingTablePageInfo')
-  if (localStorage.getItem('loginAI')) {
-    localStorage.removeItem('loginAI')
-    emitter.emit('login-success')
-  }
   let toPath = path
   if (path === '/tracking' && !userStore.userInfo?.uname) {
     toPath = '/public-tracking'

src/views/SystemSettings/src/components/MonitoringTable/src/MonitoringTable.vue

@@ -97,7 +97,7 @@ const getTableColumns = async () => {
   tableData.value.columns = handleColumns(columnstest.value)
   tableData.value.columns?.push({
     title: 'Operation',
-    fixed: 'right',
+    fixed: 'left',
     width: 100,
     slots: { default: 'action' }
   })

src/views/SystemSettings/src/components/SettingTable/src/SettingTable.vue

@@ -77,7 +77,7 @@ const getTableColumns = async () => {
   if (props.propsType) {
     tableData.value.columns?.push({
       title: 'Action',
-      fixed: 'right',
+      fixed: 'left',
       width: 80,
       slots: { default: 'action' }
     })