Merge branch 'dev' of United_Software/k_online_ui into test

src/views/Login/src/loginView.vue

@@ -243,6 +243,7 @@ const handleLoginAfterVerify = () => {
     })
     .then((res: any) => {
       if (res.code === 200) {
+        localStorage.setItem('user_type', res.data.user_info.user_type)
         if (isRememerPwd.value) {
           saveCredentials()
         } else {

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

@@ -13,7 +13,7 @@ const columnstest = ref([
   {
     field: '_rules_type_display',
     title: 'Event',
-    type: 'normal',
+    type: 'link',
     formatter: ''
   },
   {
@@ -76,6 +76,11 @@ const handleColumns = (columns: any) => {
         ...curColumn,
         formatter: ({ cellValue }: any) => formatTimezone(cellValue)
       }
+    }  else if (item.type === 'link') {
+      curColumn = {
+        ...curColumn,
+        slots: { default: 'trackingNo' }
+      }
     }
     return curColumn
   })
@@ -189,6 +194,15 @@ onMounted(() => {
           </template>
         </TableEmpty>
       </template>
+      <!-- Tracking No字段的插槽 -->
+      <template #trackingNo="{ row, column }">
+        <span
+          style="color: var(--color-theme); cursor: pointer"
+          @click="handleedittow(row)"
+        >
+          {{ row[column.field] }}
+        </span>
+      </template>
       <template #action="{ row }">
         <el-button class="el-button--blue" style="height: 24px" @click="handleedittow(row)">
           <span class="font_family icon-icon_edit_b"></span>