Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev

ALOps_sys_fe/alops-ui/src/utils/request.js

@@ -88,7 +88,10 @@ service.interceptors.response.use(res => {
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false
           store.dispatch('LogOut').then(() => {
-            location.href = '/index'
+            // 使用Vue Router进行跳转，确保正确导航到登录页面
+            import('@/router').then(router => {
+              router.default.push('/login')
+            })
           })
       }).catch(() => {
         isRelogin.show = false

ALOps_sys_fe/alops-ui/src/views/device/files/index.vue

@@ -51,7 +51,11 @@
                 type="index"
               ></el-table-column>              
               <el-table-column label="设备编号" align="center" key="equNumber" prop="equNumber" />
-              <el-table-column label="设备名称" align="center" key="name" prop="name" :show-overflow-tooltip="true" />
+              <el-table-column label="设备名称" align="center" key="name" min-width="160" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  <span style="cursor: pointer; color: #409EFF" @click="goToDeviceDetail(scope.row.id)">{{ scope.row.name }}</span>
+                </template>
+              </el-table-column>
               <!-- <el-table-column label="设备版本" align="center" key="version" prop="version" :show-overflow-tooltip="true" /> -->
               <el-table-column label="设备类型" align="center" key="equType" prop="equType" :show-overflow-tooltip="true" />
               <el-table-column label="设备级别" align="center" key="deviceLevel" prop="deviceLevel" width="120" />
@@ -421,6 +425,10 @@ export default {
     
   },
   methods: {
+    /** 跳转到设备状态详情页面 */
+    goToDeviceDetail(id) {
+      this.$router.push(`/inMonitoring/devicesState-detail/detail/${id}`);
+    },
     /** 查询设备列表 */
     getList() {
       this.loading = true