From b662e5fd1902ed9c55b8b7434edc160f19534fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com>
Date: Thu, 30 May 2024 16:07:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   7 +-
 src/api/resources-equipment/index.ts          |  13 +
 src/api/resources-equipment/types.ts          |  18 ++
 src/typings/global.d.ts                       |   4 +
 .../components/DeviceTypeToVer.vue            |   4 +-
 .../components/DeviceTypeVersionEdit.vue      |   6 +-
 src/views/resources/equipment/index.vue       | 229 ++++++++++++++++++
 .../components/Tr069DevTypeSoftVerList.vue    |   2 +-
 8 files changed, 277 insertions(+), 6 deletions(-)
 create mode 100644 src/api/resources-equipment/index.ts
 create mode 100644 src/api/resources-equipment/types.ts
 create mode 100644 src/views/resources/equipment/index.vue

diff --git a/src/App.vue b/src/App.vue
index 066b137..883d143 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -35,5 +35,10 @@ const fontColor = computed(() => {
 </script>
 
 <style>
-
+.el-descriptions__label.el-descriptions__cell.is-bordered-label {
+  font-weight: normal !important;
+}
+.el-descriptions__title {
+  font-size: 14px !important;
+}
 </style>
diff --git a/src/api/resources-equipment/index.ts b/src/api/resources-equipment/index.ts
new file mode 100644
index 0000000..b156b53
--- /dev/null
+++ b/src/api/resources-equipment/index.ts
@@ -0,0 +1,13 @@
+import { AxiosPromise } from "axios";
+import { EquipmentTableResult } from "@/api/resources-equipment/types";
+import request from "@/utils/request";
+
+export function getEquipmentPage(
+  data: SelectForm
+): AxiosPromise<EquipmentTableResult> {
+  return request({
+    url: "/api/equipment/v1/resource-page",
+    method: "POST",
+    data,
+  });
+}
diff --git a/src/api/resources-equipment/types.ts b/src/api/resources-equipment/types.ts
new file mode 100644
index 0000000..42eb4d2
--- /dev/null
+++ b/src/api/resources-equipment/types.ts
@@ -0,0 +1,18 @@
+
+export interface EquipmentTableVO {
+  devId?: number;
+  devSno?: string;
+  devAdNo?: string;
+  devPppoe?: string;
+  devStatus?: string;
+  softVer?: string;
+  devTypeId?: number;
+  devVendorName?: string;
+  devVendorOui?: string;
+  devTypeName?: string;
+  devHardVer?: string;
+  devTypeNameNew?: string;
+  devOnline?: string;
+  devOnlineTime?: string;
+}
+export type EquipmentTableResult = PageResult<EquipmentTableVO[]>;
diff --git a/src/typings/global.d.ts b/src/typings/global.d.ts
index 9889628..9c53ec1 100644
--- a/src/typings/global.d.ts
+++ b/src/typings/global.d.ts
@@ -92,5 +92,9 @@ declare global {
     /** 是否显示 */
     show?: boolean;
   }
+  interface SelectForm extends PageQuery {
+    selectName?: string;
+    selectValue?: string;
+  }
 }
 export {};
diff --git a/src/views/resources/device-type/components/DeviceTypeToVer.vue b/src/views/resources/device-type/components/DeviceTypeToVer.vue
index 447d1d0..e53a641 100644
--- a/src/views/resources/device-type/components/DeviceTypeToVer.vue
+++ b/src/views/resources/device-type/components/DeviceTypeToVer.vue
@@ -57,7 +57,9 @@
       </div>
       <div class="mt-4">
         <div style="display: flex; justify-content: space-between">
-          <div style="font-weight: 700">设备类型对应的设备软件版本列表</div>
+          <div style="font-weight: 700; line-height: 32px; font-size: 14px">
+            设备类型对应的设备软件版本列表
+          </div>
           <div>
             <el-button type="primary" @click="openAddTypeVer">
               <i-ep-plus />
diff --git a/src/views/resources/device-type/components/DeviceTypeVersionEdit.vue b/src/views/resources/device-type/components/DeviceTypeVersionEdit.vue
index 8aa0f62..83396ad 100644
--- a/src/views/resources/device-type/components/DeviceTypeVersionEdit.vue
+++ b/src/views/resources/device-type/components/DeviceTypeVersionEdit.vue
@@ -422,7 +422,7 @@
         </div>
         <div class="mt-4">
           <div style="display: flex; justify-content: space-between">
-            <div style="font-weight: 700">
+            <div style="font-weight: 700; line-height: 32px; font-size: 14px">
               设备类型及设备软件版本支持的设备厂商配置文件列表
             </div>
             <div>
@@ -470,7 +470,7 @@
         </div>
         <div class="mt-4">
           <div style="display: flex; justify-content: space-between">
-            <div style="font-weight: 700">已绑定系统管理域</div>
+            <div style="font-weight: 700; line-height: 32px; font-size: 14px">已绑定系统管理域</div>
             <div>
               <el-button type="primary" @click="openDomainTree"
                 ><i-ep-plus />增加系统管理域</el-button
@@ -498,7 +498,7 @@
         </div>
         <div class="mt-4">
           <div style="display: flex; justify-content: space-between">
-            <div style="font-weight: 700">
+            <div style="font-weight: 700; line-height: 32px; font-size: 14px">
               设备类型及设备软件版本支持的业务信息列表
             </div>
           </div>
diff --git a/src/views/resources/equipment/index.vue b/src/views/resources/equipment/index.vue
new file mode 100644
index 0000000..b3670ca
--- /dev/null
+++ b/src/views/resources/equipment/index.vue
@@ -0,0 +1,229 @@
+<template>
+  <div class="app-container">
+    <div class="search-container">
+      <el-form :model="queryForm" :inline="true">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="查询条件">
+              <el-select
+                v-model="queryForm.selectName"
+                placeholder="请选择"
+                style="width: 240px"
+                clearable
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="queryForm.selectName != undefined">
+            <el-input
+              v-model="queryForm.selectValue"
+              placeholder="请输入"
+              style="width: 300px"
+            />
+          </el-col>
+          <el-col :span="buttonColSpan">
+            <el-form-item>
+              <el-button type="primary" :icon="Search" @click="getData"
+                >搜索</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <el-card shadow="never">
+      <template #header>
+        <div class="table-head-parent">
+          <div>
+            <el-button type="primary" plain><i-ep-plus />新增</el-button>
+            <el-button type="danger" plain><i-ep-delete />删除</el-button>
+          </div>
+          <table-bar :columns="columns" @change-columns="changeColumns" />
+        </div>
+      </template>
+      <div class="any-table">
+        <el-table :data="tableData" v-loading="loading">
+          <el-table-column
+            label="设备标识"
+            align="center"
+            width="240"
+            show-overflow-tooltip
+            v-if="columns[0].show"
+          >
+            <template #default="scope">
+              <el-button type="primary" link
+                >{{ scope.row.devVendorOui }}-{{ scope.row.devSno }}</el-button
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="AD编号"
+            align="center"
+            show-overflow-tooltip
+            prop="devAdNo"
+            v-if="columns[1].show"
+          />
+          <el-table-column
+            label="宽带账号"
+            align="center"
+            prop="devPppoe"
+            show-overflow-tooltip
+            v-if="columns[2].show"
+          />
+          <el-table-column
+            label="设备类型"
+            align="center"
+            show-overflow-tooltip
+            v-if="columns[3].show"
+          >
+            <template #default="scope">
+              <el-button
+                type="primary"
+                link
+                @click="redirect(scope.row.devTypeId)"
+              >
+                {{ scope.row.devVendorName }}&nbsp;{{
+                  scope.row.devTypeName
+                }}&nbsp;{{ scope.row.devHardVer }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="软件版本"
+            align="center"
+            prop="softVer"
+            v-if="columns[4].show"
+          />
+          <el-table-column
+            label="设备上行方式"
+            align="center"
+            v-if="columns[5].show"
+          />
+          <el-table-column
+            label="设备在线时间"
+            align="center"
+            prop="devOnlineTime"
+            v-if="columns[6].show"
+          />
+          <el-table-column
+            label="设备状态"
+            align="center"
+            prop="devStatus"
+            v-if="columns[7].show"
+          >
+            <template #default="scope">
+              <el-tag>{{ scope.row.devStatus }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="是否合法"
+            align="center"
+            v-if="columns[8].show"
+          >
+            <template #default="scope">
+              <el-tag v-if="scope.row.devStatus === '未注册'">非法</el-tag>
+              <el-tag v-else>正常</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="在线状态"
+            align="center"
+            prop="devOnline"
+            v-if="columns[9].show"
+          >
+            <template #default="scope">
+              <el-tag>{{ scope.row.devOnline }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="网元类型"
+            align="center"
+            prop="devTypeNameNew"
+            v-if="columns[10].show"
+          />
+        </el-table>
+        <pagination
+          v-if="total > 0"
+          v-model:total="total"
+          v-model:page="queryForm.pageNum"
+          v-model:limit="queryForm.pageSize"
+          @pagination="getData"
+        />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { Search } from "@element-plus/icons-vue";
+import { EquipmentTableVO } from "@/api/resources-equipment/types";
+import { getEquipmentPage } from "@/api/resources-equipment";
+
+defineOptions({
+  name: "Equipment",
+  inheritAttrs: false,
+});
+const queryForm = ref<SelectForm>({
+  pageNum: 1,
+  pageSize: 10,
+});
+const loading = ref<boolean>(false);
+const options = ref<OptionType[]>([{ label: "AD编号", value: "devAdNo" }]);
+const buttonColSpan = computed(() => {
+  return queryForm.value.selectName === undefined ? 18 : 12;
+});
+const total = ref<number>(0);
+const tableData = ref<EquipmentTableVO[]>([]);
+const columns = ref<TableColumns[]>([
+  { name: "设备标识", show: true },
+  { name: "AD编号", show: true },
+  { name: "宽带账号", show: true },
+  { name: "设备类型", show: true },
+  { name: "软件版本", show: true },
+  { name: "设备上行方式", show: false },
+  { name: "设备在线时间", show: false },
+  { name: "设备状态", show: true },
+  { name: "是否合法", show: true },
+  { name: "在线状态", show: true },
+  { name: "网元类型", show: true },
+]);
+const changeColumns = (newColumns: TableColumns[]) => {
+  columns.value = newColumns;
+};
+const router = useRouter();
+const redirect = (devTypeId: number) => {
+  router.push({
+    path: `/resources/device_type_to_ver/${devTypeId}`,
+  });
+};
+const getData = () => {
+  if (
+    queryForm.value.selectName === undefined ||
+    queryForm.value.selectValue === undefined
+  ) {
+    ElMessage({
+      message: "查询条件不能为空",
+      type: "error",
+      duration: 1000,
+    });
+    return;
+  }
+  loading.value = true;
+  getEquipmentPage(queryForm.value)
+    .then(({ data }) => {
+      tableData.value = data.list;
+      total.value = data.total;
+    })
+    .finally(() => {
+      loading.value = false;
+    });
+};
+</script>
+
+<style scoped></style>
diff --git a/src/views/resources/tr069/components/Tr069DevTypeSoftVerList.vue b/src/views/resources/tr069/components/Tr069DevTypeSoftVerList.vue
index 652eda9..adee3b0 100644
--- a/src/views/resources/tr069/components/Tr069DevTypeSoftVerList.vue
+++ b/src/views/resources/tr069/components/Tr069DevTypeSoftVerList.vue
@@ -3,7 +3,7 @@
     <el-card shadow="never">
       <div class="mb-4">
         <div style="display: flex; justify-content: space-between">
-          <div style="font-weight: 700">设备类型对应的设备软件版本列表</div>
+          <div style="font-weight: 700; line-height: 32px; font-size: 14px">设备类型对应的设备软件版本列表</div>
           <div>
             <el-button type="primary" @click="skipBindingDevType">
               <i-ep-plus />