fit: bug修复

src/api/resources-equipment/index.ts

@@ -21,7 +21,7 @@ export function getEquipmentPage(
   });
 }
 export function getEquipmentAdvancePage(
-  data: EquipmentAdvanceQuery
+  data: EquipmentAdvanceQuery | undefined
 ): AxiosPromise<EquipmentTableResult> {
   return request({
     url: "/api/equipment/v1/advance-query-page",

src/router/index.ts

@@ -505,6 +505,17 @@ export const constantRoutes: RouteRecordRaw[] = [
           title: "工作流详情",
         },
       },
+      {
+        path: "/resources/web-applications",
+        name: "WebApplications",
+        component: () =>
+          import("@/views/family/operate/web-applications/index.vue"),
+        meta: {
+          hidden: true,
+          keepAlive: true,
+          title: "网络应用",
+        },
+      },
     ],
   },
 ];

src/views/family/operate/fault-management/components/basicInfoQuery.vue

@@ -205,6 +205,18 @@ const getBasicInfo = (queryVO: FaultQueryVO) => {
     });
 };
 defineExpose({ getBasicInfo });
+const route = useRoute();
+watch(
+  () => route.query.devId,
+  () => {
+    let devId = <string>route.query.devId;
+    if (devId) {
+      let vo = <FaultQueryVO>{ devId };
+      getBasicInfo(vo);
+    }
+  },
+  { immediate: true }
+);
 </script>
 
 <style scoped>

src/views/family/operate/fault-management/index.vue

@@ -15,7 +15,9 @@
             />
             <div class="dropdown" v-if="flag" v-loading="loading">
               <div class="close" @click="flag = false">
-                <el-icon size="18"><Close /></el-icon>
+                <el-icon size="18">
+                  <Close />
+                </el-icon>
               </div>
               <el-scrollbar max-height="200">
                 <div>
@@ -53,8 +55,8 @@
               <el-radio value="adNo">AD编号</el-radio>
               <el-radio value="pppoeAccount">上网账号</el-radio>
               <el-radio disabled value="identificationNumber"
-                >身份证号</el-radio
-              >
+                >身份证号
+              </el-radio>
               <el-radio disabled value="phoneNumber">电话号码</el-radio>
             </el-radio-group>
           </div>
@@ -148,12 +150,15 @@ const searchForm = ref<FaultQuery>({
   ping: [],
 });
 const basicInfoQueryRef = ref();
+const route = useRoute();
 const flag = ref<boolean>(false);
 const faultOptions = ref<FaultQueryVO[]>([]);
 const currentTab = ref<number>(0);
+
 function isActive(tab: number) {
   return currentTab.value === tab;
 }
+
 const changTab = (tab: number) => {
   currentTab.value = tab;
 };
@@ -173,12 +178,23 @@ const loadBasicInfo = (vo: FaultQueryVO) => {
   currentFaultQueryVO.value = vo;
   basicInfoQueryRef.value.getBasicInfo(vo);
 };
+watch(
+  () => route.query.devId,
+  () => {
+    let devId = <string>route.query.devId;
+    if (devId) {
+      currentFaultQueryVO.value.devId = devId;
+    }
+  },
+  { immediate: true }
+);
 </script>
 
 <style scoped>
 :deep(.el-card__body) {
   padding: 5px;
 }
+
 .tags-container {
   width: 100%;
   height: 50px;
@@ -199,6 +215,7 @@ const loadBasicInfo = (vo: FaultQueryVO) => {
     background-color: #fff;
     border: 1px solid var(--el-border-color-light);
     border-radius: 6px;
+
     &:hover {
       color: var(--el-color-primary);
     }
@@ -216,10 +233,12 @@ const loadBasicInfo = (vo: FaultQueryVO) => {
     }
   }
 }
+
 :deep(.my-label) {
   width: 60px !important;
   background: var(--el-color-white) !important;
 }
+
 .dropdown {
   border: 1px solid #ccc;
   width: inherit;
@@ -232,6 +251,7 @@ const loadBasicInfo = (vo: FaultQueryVO) => {
   text-align: center;
   color: var(--el-input-text-color, var(--el-text-color-regular));
 }
+
 .dropdown .close {
   height: 20px;
   position: absolute;
@@ -240,10 +260,12 @@ const loadBasicInfo = (vo: FaultQueryVO) => {
   cursor: pointer;
   right: 0;
 }
+
 .dropdown .close:hover {
   background-color: var(--el-color-primary);
   color: var(--el-color-white);
 }
+
 .dropdown ul {
   list-style: none;
   padding: 0;

src/views/family/operate/remote-operation/index.vue

@@ -50,13 +50,14 @@
         <el-table
           :data="tableData"
           style="width: 100%"
+          border
           max-height="380"
           v-loading="loading"
         >
           <el-table-column
             label="设备标识"
             align="center"
-            width="230"
+            width="250"
             fixed
             show-overflow-tooltip
             v-if="columns[0].show"
@@ -110,11 +111,13 @@
             label="设备在线时间"
             align="center"
             prop="devOnlineTime"
+            width="200"
             v-if="columns[6].show"
           />
           <el-table-column
             label="设备状态"
             align="center"
+            width="110"
             prop="devStatus"
             v-if="columns[7].show"
           >
@@ -125,6 +128,7 @@
           <el-table-column
             label="是否合法"
             align="center"
+            width="110"
             v-if="columns[8].show"
           >
             <template #default="scope">
@@ -135,12 +139,32 @@
           <el-table-column
             label="在线状态"
             align="center"
-            width="100"
+            width="110"
             prop="devOnline"
             v-if="columns[9].show"
           >
             <template #default="scope">
-              <el-tag>{{ scope.row.devOnline }}</el-tag>
+              <el-button
+                :loading="onlineLoading"
+                :type="scope.row.devOnline === '在线' ? 'primary' : 'danger'"
+                link
+                @click="loadDevOnline(scope.row)"
+              >
+                {{ scope.row.devOnline }}</el-button
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="200"
+            fixed="right"
+          >
+            <template #default="scope">
+              <el-button type="primary" @click="skipFault(scope.row)" link
+                >故障管理</el-button
+              >
+              <el-button type="primary" @click="skipWebApp(scope.row)" link>网络应用</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -160,6 +184,7 @@
 import { Search } from "@element-plus/icons-vue";
 import { RemoteEquipmentTable } from "@/api/resources-equipment/types";
 import { remoteTablePage } from "@/api/resources-equipment";
+import { checkDevOnline } from "@/api/remote";
 defineOptions({
   name: "RemoteOperation",
   inheritAttrs: false,
@@ -177,6 +202,7 @@ const options = ref<OptionType[]>([
   { label: "设备PPPOE账号", value: "pppoeAccount" },
 ]);
 const loading = ref<boolean>(false);
+const onlineLoading = ref<boolean>(false);
 const buttonColSpan = computed(() => {
   return queryForm.value.selectName === undefined ? 18 : 12;
 });
@@ -193,8 +219,8 @@ const columns = ref<TableColumns[]>([
   { name: "软件版本", show: true },
   { name: "设备上行方式", show: false },
   { name: "设备在线时间", show: false },
-  { name: "设备状态", show: true },
-  { name: "是否合法", show: true },
+  { name: "设备状态", show: false },
+  { name: "是否合法", show: false },
   { name: "在线状态", show: true },
 ]);
 const changeColumns = (newColumns: TableColumns[]) => {
@@ -229,6 +255,38 @@ const skipRemoteInfo = (row: RemoteEquipmentTable) => {
     path: `/resources/remote-info/${row.devId}/${row.typeAndVerId}`,
   });
 };
+const skipFault = (row: RemoteEquipmentTable) => {
+  router.push({
+    name: "FaultManagement",
+    query: { devId: row.devId },
+  });
+};
+const loadDevOnline = (row: RemoteEquipmentTable) => {
+  onlineLoading.value = true;
+  checkDevOnline(prop.devId)
+    .then(({ data }) => {
+      let resultCode = data.resultCode;
+      let resultState = data.resultState;
+      if ("2" === resultState) {
+        if (resultCode === "401") {
+          row.devOnline = "离线";
+        } else {
+          row.devOnline = "在线";
+        }
+      } else {
+        row.devOnline = "离线";
+      }
+    })
+    .finally(() => {
+      onlineLoading.value = false;
+    });
+};
+const skipWebApp = (row: RemoteEquipmentTable) => {
+  router.push({
+    name: "WebApplications",
+    query: { devId: row.devId },
+  });
+};
 </script>
 
 <style scoped>

src/views/family/operate/web-applications/index.vue

@@ -0,0 +1,12 @@
+<template>
+  <div class="app-container"></div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: "WebApplications",
+  inheritAttrs: false,
+});
+</script>
+
+<style scoped></style>

src/views/family/operate/workflow/components/UpdateWorkflow.vue

@@ -141,7 +141,9 @@
       </div>
       <template #footer>
         <div class="flex justify-end">
-          <el-button type="primary" @click="submitForm(baseFormRef)">提交表单</el-button>
+          <el-button type="primary" @click="submitForm(baseFormRef)"
+            >提交表单</el-button
+          >
         </div>
       </template>
     </el-card>
@@ -160,7 +162,8 @@ import { getDomainOptions } from "@/api/domain";
 import {
   addPlanFilterConfig,
   getWorkflowStatusForm,
-  planConfigOption, updatePlanFilterConfig
+  planConfigOption,
+  updatePlanFilterConfig,
 } from "@/api/workflow";
 import { confirm } from "@/utils/confirm";
 

src/views/resources/operate-type/index.vue

@@ -45,7 +45,7 @@
           <el-table-column
             label="组件操作名称"
             prop="operateName"
-            align="center"
+            align="left"
             width="300"
             show-overflow-tooltip
           />
@@ -53,7 +53,7 @@
             label="组件包名称"
             width="300"
             prop="fileName"
-            align="center"
+            align="left"
             show-overflow-tooltip
           >
             <template #default="scope">