From 88ab8c2526787f9c9ebeb8a2bba5f5bc5c214d65 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 12 Mar 2024 16:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=98=E5=88=B6=E6=8A=80=E6=9C=AF=E7=9B=91?=
 =?UTF-8?q?=E7=9D=A3=20ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/photovoltaic.vue               |   1 +
 .../electricalEnergy/components/audit.vue     | 119 ++++++++++++++
 .../components/maintenance.vue                | 144 +++++++++++++++++
 .../pqs/supervise/electricalEnergy/index.vue  |  11 +-
 .../harmonicSurvey/components/outcome.vue     |  97 +++++++++++-
 .../harmonicSurvey/components/planAudits.vue  |  67 +++++++-
 .../harmonicSurvey/components/planManage.vue  | 134 +++++++++++++++-
 .../pqs/supervise/harmonicSurvey/index.vue    |   8 +-
 src/views/pqs/supervise/interfere/index.vue   |   8 +-
 src/views/pqs/supervise/technology/index.vue  |   6 +-
 .../terminal/components/cycleTab.vue          | 138 +++++++++++++++++
 .../terminal/components/networkTab.vue        | 146 ++++++++++++++++++
 src/views/pqs/supervise/terminal/index.vue    |  23 ++-
 13 files changed, 861 insertions(+), 41 deletions(-)
 create mode 100644 src/views/pqs/supervise/electricalEnergy/components/audit.vue
 create mode 100644 src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
 create mode 100644 src/views/pqs/supervise/terminal/components/cycleTab.vue
 create mode 100644 src/views/pqs/supervise/terminal/components/networkTab.vue

diff --git a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
index 05053b8f..dfe32e18 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
@@ -21,6 +21,7 @@
                         <el-upload action="" :show-file-list="false" :auto-upload="false" :on-change="choose">
                             <el-button type="primary" class="ml10" icon="el-icon-Upload">离线导入</el-button>
                         </el-upload>
+                        <el-button type="primary" class="ml10" icon="el-icon-Ticket">模型训练</el-button>
                     </el-form-item>
                 </el-form>
 
diff --git a/src/views/pqs/supervise/electricalEnergy/components/audit.vue b/src/views/pqs/supervise/electricalEnergy/components/audit.vue
new file mode 100644
index 00000000..a7adb434
--- /dev/null
+++ b/src/views/pqs/supervise/electricalEnergy/components/audit.vue
@@ -0,0 +1,119 @@
+<template>
+    <div>
+        <div>
+            <TableHeader area datePicker ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="问题来源">
+                        <el-select v-model="tableStore.table.params.searchState" placeholder="请选择问题来源">
+                            <el-option
+                                v-for="item in uploadData"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="填报进度">
+                        <el-select v-model="tableStore.table.params.searchStat1e" placeholder="请选择填报进度">
+                            <el-option
+                                v-for="item in uploadData"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="问题名称">
+                        <el-select v-model="tableStore.table.params.searchState3" placeholder="请输入问题名称">
+                            <el-option
+                                v-for="item in uploadData"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </template>
+                <template #operation>
+                    <el-button icon="el-icon-Stamp" type="primary">审核</el-button>
+                    <el-button icon="el-icon-PieChart" type="primary">历史审核记录</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
+
+const dictData = useDictData()
+const uploadData = [
+    {
+        id: 0,
+
+        label: '未上传'
+    },
+    {
+        id: 1,
+
+        label: '已上传'
+    }
+]
+
+const dialogVisible = ref(false)
+const TableHeaderRef = ref()
+const title = ref('')
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/system-boot/area/areaSelect',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        { width: '60', type: 'checkbox' },
+        {
+            field: 'index',
+            title: '序号',
+            width: '60',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'orgName', title: '所属单位' },
+        {
+            field: 'problemSources',
+            title: '问题来源'
+        },
+        { field: 'powerQualityProblemNo', title: '问题编号' },
+        { field: 'problemName', title: '问题名称' },
+
+        { field: 'dataDate', title: '提交时间' },
+        { field: 'reportProcess', title: '填报节点' }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data = [
+            {
+                status: 2
+            }
+        ]
+    }
+})
+
+tableStore.table.params.searchState = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.type = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue b/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
new file mode 100644
index 00000000..0f6b8b7a
--- /dev/null
+++ b/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
@@ -0,0 +1,144 @@
+<template>
+    <TableHeader area datePicker ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="问题来源">
+                <el-select v-model="tableStore.table.params.searchState1" placeholder="请选择问题来源">
+                    <el-option
+                        v-for="item in uploadData"
+                        :key="item.id"
+                        :label="item.label"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="填报进度">
+                <el-select v-model="tableStore.table.params.searchState2" placeholder="请选择填报进度">
+                    <el-option
+                        v-for="item in uploadData"
+                        :key="item.id"
+                        :label="item.label"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="审核状态">
+                <el-select v-model="tableStore.table.params.searchState3" placeholder="请选择审核状态">
+                    <el-option
+                        v-for="item in uploadData"
+                        :key="item.id"
+                        :label="item.label"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="问题名称">
+                <el-select v-model="tableStore.table.params.searchState4" placeholder="请输入问题名称">
+                    <el-option
+                        v-for="item in uploadData"
+                        :key="item.id"
+                        :label="item.label"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Plus" type="primary">新增</el-button>
+            <el-button icon="el-icon-EditPen" type="primary">填报</el-button>
+            <el-button icon="el-icon-Delete" type="primary">删除</el-button>
+            <el-button icon="el-icon-SuccessFilled" type="primary">归档</el-button>
+            <el-button icon="el-icon-PieChart" type="primary">历史审核记录</el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+
+const dictData = useDictData()
+const uploadData = [
+    {
+        id: 0,
+
+        label: '未上传'
+    },
+    {
+        id: 1,
+
+        label: '已上传'
+    }
+]
+
+const dialogVisible = ref(false)
+const title = ref('')
+const TableHeaderRef = ref()
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/system-boot/area/areaSelect',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        { width: '60', type: 'checkbox' },
+        {
+            field: 'index',
+            title: '序号',
+            width: '60',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'orgName', title: '所属单位' },
+        {
+            field: 'problemSources',
+            title: '问题来源'
+        },
+        { field: 'powerQualityProblemNo', title: '问题编号' },
+        { field: 'problemName', title: '问题名称' },
+        { field: 'dataDate', title: '问题新建时间' },
+        { field: 'reportProcess', title: '填报进度' },
+        { field: 'reportProcessStatus', title: '审核状态' },
+        {
+            title: '详情',
+            width: '120',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '查看',
+                    type: 'primary',
+                    disabled: row => {
+                        return row.reportProcess != 'Not_Reported' && row.reportProcess != 'Archived'
+                    },
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: async row => {}
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data = [
+            {
+                status: 2
+            }
+        ]
+    }
+})
+
+tableStore.table.params.searchState1 = ''
+tableStore.table.params.searchState2 = ''
+tableStore.table.params.searchState3 = ''
+tableStore.table.params.searchState4 = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/electricalEnergy/index.vue b/src/views/pqs/supervise/electricalEnergy/index.vue
index 957c7e6e..b18e2a95 100644
--- a/src/views/pqs/supervise/electricalEnergy/index.vue
+++ b/src/views/pqs/supervise/electricalEnergy/index.vue
@@ -1,15 +1,20 @@
 <template>
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
-            <el-tab-pane label="电能质量问题查询维护" name="1"></el-tab-pane>
-            <el-tab-pane label="电能质量问题审核" name="2"></el-tab-pane>
+            <el-tab-pane label="电能质量问题查询维护" name="1">
+                <maintenance v-if="activeName == '1'" />
+            </el-tab-pane>
+            <el-tab-pane label="电能质量问题审核" name="2">
+                <audit v-if="activeName == '2'" />
+            </el-tab-pane>
         </el-tabs>
     </div>
 </template>
 
 <script setup lang="ts">
 import { onMounted, reactive, ref, provide } from 'vue'
-
+import maintenance from './components/maintenance.vue'
+import audit from './components/audit.vue'
 import { mainHeight } from '@/utils/layout'
 defineOptions({
     name: 'Processsupervision/electricitymanagement'
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue b/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue
index a3cd27c8..73e69b80 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue
@@ -1,11 +1,92 @@
 <template>
-
-    <div>结果 </div>
-
+    <div>
+        <div>
+            <TableHeader area datePicker ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="是否上传">
+                        <el-select v-model="tableStore.table.params.searchState" placeholder="请选择是否上传">
+                            <el-option
+                                v-for="item in uploadData"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </template>
+                <template #operation>
+                    <el-button icon="el-icon-Upload" type="primary">上传</el-button>
+                    <el-button icon="el-icon-Download" type="primary">导出</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+        </div>
+    </div>
 </template>
-<script setup lang='ts'>
-import { ref, reactive } from 'vue'
-</script>
-<style lang="scss" scoped>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
 
-</style>
+const dictData = useDictData()
+const uploadData = [
+    {
+        id: 0,
+
+        label: '未上传'
+    },
+    {
+        id: 1,
+
+        label: '已上传'
+    }
+]
+
+const dialogVisible = ref(false)
+const TableHeaderRef = ref()
+const title = ref('')
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/system-boot/area/areaSelect',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        { width: '60', type: 'checkbox' },
+        { field: 'orgName', title: '责任单位' },
+        {
+            field: 'planNo',
+            title: '普测计划编号'
+        },
+        { field: 'planName', title: '普测计划名称' },
+        { field: 'planStartTime', title: '开始时间' },
+        { field: 'planEndTime', title: '结束时间' },
+        { field: 'subCount', title: '普测变电站数量' },
+        { field: 'isFileUpload', title: '是否上传' },
+        { field: 'fileCount', title: '上传文件数量' },
+        { field: 'uploadTime', title: '上传时间' }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data = [
+            {
+                status: 2
+            }
+        ]
+    }
+})
+
+tableStore.table.params.searchState = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.type = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue b/src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue
index c79f4b49..d349e865 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue
@@ -1,11 +1,62 @@
 <template>
-
-    <div> 审核</div>
-
+    <div>
+        <div>
+            <TableHeader area datePicker ref="TableHeaderRef">
+                <template #operation>
+                    <el-button icon="el-icon-Stamp" type="primary">审核</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+        </div>
+    </div>
 </template>
-<script setup lang='ts'>
-import { ref, reactive } from 'vue'
-</script>
-<style lang="scss" scoped>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
 
-</style>
+const dictData = useDictData()
+
+const dialogVisible = ref(false)
+const TableHeaderRef = ref()
+const title = ref('')
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/system-boot/area/areaSelect',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        { width: '60', type: 'checkbox' },
+
+        { field: 'orgName', title: '所属单位' },
+        { field: 'planNo', title: '普测计划编号' },
+        { field: 'planName', title: '普测计划名称' },
+        { field: 'planStartTime', title: '开始时间' },
+        { field: 'planEndTime', title: '结束时间' },
+        { field: 'subCount', title: '普测变电站数量' }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data = [
+            {
+                status: 2
+            }
+        ]
+    }
+})
+
+tableStore.table.params.searchState = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.type = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
index f3b77c64..f725fd87 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
@@ -1,11 +1,129 @@
 <template>
-
-    <div> 计划管理</div>
-
+    <div>
+        <div>
+            <TableHeader area datePicker ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label=" 计划状态">
+                        <el-select v-model="tableStore.table.params.searchState" placeholder="请选择 计划状态">
+                            <el-option
+                                v-for="item in planstatus"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </template>
+                <template #operation>
+                    <el-button icon="el-icon-Plus" type="primary">新增计划</el-button>
+                    <el-button icon="el-icon-Stamp" type="primary">提交审核</el-button>
+                    <el-button icon="el-icon-Download" type="primary">导出</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+        </div>
+    </div>
 </template>
-<script setup lang='ts'>
-import { ref, reactive } from 'vue'
-</script>
-<style lang="scss" scoped>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
 
-</style>
+const dictData = useDictData()
+const planstatus = [
+    {
+        id: 0,
+        value: '选项1',
+        label: '新建'
+    },
+    {
+        id: 1,
+        value: '选项1',
+        label: '待审核'
+    },
+    {
+        id: 2,
+        value: '选项1',
+        label: '未通过'
+    },
+    {
+        id: 3,
+        value: '选项1',
+        label: '已发布'
+    }
+]
+
+const dialogVisible = ref(false)
+const TableHeaderRef = ref()
+const title = ref('')
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/system-boot/area/areaSelect',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        { width: '60', type: 'checkbox' },
+        { field: 'orgName', title: '责任单位' },
+        {
+            field: 'planNo',
+            title: '普测计划编号'
+        },
+        { field: 'planName', title: '普测计划名称' },
+        { field: 'planStartTime', title: '开始时间' },
+        { field: 'planEndTime', title: '结束时间' },
+        { field: 'subCount', title: '普测变电站数量' },
+        { field: 'status', title: '计划状态' },
+
+        {
+            title: '计划详情',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '查看',
+                    type: 'primary',
+
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {}
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: '',
+                    disabled: row => {
+                        return !(row.status == 0 || row.status == 2)
+                    },
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: async row => {}
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data = [
+            {
+                status: 2
+            }
+        ]
+    }
+})
+
+tableStore.table.params.searchState = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.type = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/harmonicSurvey/index.vue b/src/views/pqs/supervise/harmonicSurvey/index.vue
index d163a3ee..5b62b4b9 100644
--- a/src/views/pqs/supervise/harmonicSurvey/index.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/index.vue
@@ -2,13 +2,13 @@
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
             <el-tab-pane label="普测计划管理" name="1">
-                <planManage />
+                <planManage v-if="activeName == '1'" />
             </el-tab-pane>
             <el-tab-pane label="普测计划审批" name="2">
-                <planAudits />
+                <planAudits  v-if="activeName == '2'"/>
             </el-tab-pane>
-            <el-tab-pane label="普测结果管理" name="3"><outcome /></el-tab-pane>
-            <el-tab-pane label="普测计划占比配置" name="4"><occupancy /></el-tab-pane>
+            <el-tab-pane label="普测结果管理" name="3"><outcome v-if="activeName == '3'"/></el-tab-pane>
+            <el-tab-pane label="普测计划占比配置" name="4"><occupancy v-if="activeName == '4'"/></el-tab-pane>
         </el-tabs>
     </div>
 </template>
diff --git a/src/views/pqs/supervise/interfere/index.vue b/src/views/pqs/supervise/interfere/index.vue
index 06098849..7a348a01 100644
--- a/src/views/pqs/supervise/interfere/index.vue
+++ b/src/views/pqs/supervise/interfere/index.vue
@@ -2,11 +2,11 @@
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
             <el-tab-pane label="未建档非线性用户录入及查询" name="1">
-                <undocumented />
+                <undocumented v-if="activeName == '1'"/>
             </el-tab-pane>
-            <el-tab-pane label="入网评估报告审核" name="2"><network /></el-tab-pane>
-            <el-tab-pane label="干扰源用户常态化管理" name="3"><normal /></el-tab-pane>
-            <el-tab-pane label="实测报告审核" name="4"><report /></el-tab-pane>
+            <el-tab-pane label="入网评估报告审核" name="2"><network  v-if="activeName == '2'"/></el-tab-pane>
+            <el-tab-pane label="干扰源用户常态化管理" name="3"><normal  v-if="activeName == '3'"/></el-tab-pane>
+            <el-tab-pane label="实测报告审核" name="4"><report  v-if="activeName == '4'"/></el-tab-pane>
         </el-tabs>
     </div>
 </template>
diff --git a/src/views/pqs/supervise/technology/index.vue b/src/views/pqs/supervise/technology/index.vue
index 989a6210..aab931d1 100644
--- a/src/views/pqs/supervise/technology/index.vue
+++ b/src/views/pqs/supervise/technology/index.vue
@@ -2,11 +2,11 @@
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
             <el-tab-pane label="概览" name="1"></el-tab-pane>
-            <el-tab-pane label="技术监督管理" name="2"><technology /></el-tab-pane>
+            <el-tab-pane label="技术监督管理" name="2"><technology  v-if="activeName == '2'"/></el-tab-pane>
             <el-tab-pane label="告警单策略管理" name="3">
-                <earlyWarning />
+                <earlyWarning  v-if="activeName == '3'"/>
             </el-tab-pane>
-            <el-tab-pane label="预警单策略管理" name="4"><earlyWarning /></el-tab-pane>
+            <el-tab-pane label="预警单策略管理" name="4"><earlyWarning  v-if="activeName == '4'"/></el-tab-pane>
         </el-tabs>
     </div>
 </template>
diff --git a/src/views/pqs/supervise/terminal/components/cycleTab.vue b/src/views/pqs/supervise/terminal/components/cycleTab.vue
new file mode 100644
index 00000000..2e3603fd
--- /dev/null
+++ b/src/views/pqs/supervise/terminal/components/cycleTab.vue
@@ -0,0 +1,138 @@
+<template>
+    <div>
+        <div>
+            <TableHeader area ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="终端名称">
+                        <el-select v-model="tableStore.table.params.searchState" placeholder="请选择终端名称">
+                            <el-option
+                                v-for="item in uploadData"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="生产厂家">
+                        <el-select v-model="tableStore.table.params.searchStat1e" placeholder="请选择生产厂家">
+                            <el-option
+                                v-for="item in uploadData"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="检测结果">
+                        <el-select v-model="tableStore.table.params.searchState3" placeholder="请输入检测结果">
+                            <el-option
+                                v-for="item in uploadData"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </template>
+                <template #operation>
+                    <el-button icon="el-icon-Download" type="primary">导出</el-button>
+                    <el-button icon="el-icon-Upload" type="primary">上传检测报告</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
+
+const dictData = useDictData()
+const uploadData = [
+    {
+        id: 0,
+
+        label: '未上传'
+    },
+    {
+        id: 1,
+
+        label: '已上传'
+    }
+]
+
+const dialogVisible = ref(false)
+const TableHeaderRef = ref()
+const title = ref('')
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/system-boot/area/areaSelect',
+    publicHeight: 85,
+    method: 'POST',
+    column: [
+        { width: '60', type: 'checkbox' },
+       
+        { field: 'id', title: '终端编号' },
+        { field: 'name', title: '上产厂家' },
+        { field: 'orgName', title: '安装位置' },
+        { field: 'inspectionUnit', title: '送检单位' },
+        { field: 'testResults', title: '检测结果' },
+        { field: 'nextInspectionTime', title: '下次监测时间' },
+        {
+            title: '操作',
+            width: '180',
+            render: 'buttons',
+            fixed: 'right',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '下载原始数据报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.originalReport == null
+                    },
+                    click: row => {}
+                },
+                {
+                    name: 'edit',
+                    title: '下载检测报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.inspectionReport == null
+                    },
+                    click: row => {}
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data = [
+            {
+                status: 2
+            }
+        ]
+    }
+})
+
+tableStore.table.params.searchState = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.type = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/terminal/components/networkTab.vue b/src/views/pqs/supervise/terminal/components/networkTab.vue
new file mode 100644
index 00000000..f32eb0f5
--- /dev/null
+++ b/src/views/pqs/supervise/terminal/components/networkTab.vue
@@ -0,0 +1,146 @@
+<template>
+    <div>
+        <div>
+            <TableHeader area ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="终端名称">
+                        <el-select v-model="tableStore.table.params.searchState" placeholder="请选择终端名称">
+                            <el-option
+                                v-for="item in uploadData"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="生产厂家">
+                        <el-select v-model="tableStore.table.params.searchStat1e" placeholder="请选择生产厂家">
+                            <el-option
+                                v-for="item in uploadData"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="检测结果">
+                        <el-select v-model="tableStore.table.params.searchState3" placeholder="请输入检测结果">
+                            <el-option
+                                v-for="item in uploadData"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </template>
+                <template #operation>
+                    <el-button icon="el-icon-Plus" type="primary">新增</el-button>
+                    <el-button icon="el-icon-Edit" type="primary">修改</el-button>
+                    <el-button icon="el-icon-Delete" type="primary">删除</el-button>
+                    <el-button icon="el-icon-Download" type="primary">导出</el-button>
+                    <el-button icon="el-icon-Download" type="primary">下载模板</el-button>
+                    <el-button icon="el-icon-Upload" type="primary">excel导入</el-button>
+                    <el-button icon="el-icon-Upload" type="primary">上传原始报告</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
+
+const dictData = useDictData()
+const uploadData = [
+    {
+        id: 0,
+
+        label: '未上传'
+    },
+    {
+        id: 1,
+
+        label: '已上传'
+    }
+]
+
+const dialogVisible = ref(false)
+const TableHeaderRef = ref()
+const title = ref('')
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/system-boot/area/areaSelect',
+    publicHeight: 85,
+    method: 'POST',
+    column: [
+        { width: '60', type: 'checkbox' },
+       
+        { field: 'orgName', title: '所属单位' },
+        { field: 'id', title: '终端编号' },
+        { field: 'name', title: '终端名称' },
+        { field: 'manufacture', title: '生产厂家' },
+        { field: 'installPlace', title: '安装位置' },
+        { field: 'inspectionUnit', title: '送检单位' },
+        { field: 'testResults', title: '检测结果' },
+        { field: 'inspectionTime', title: '检测时间' },
+        { field: 'nextInspectionTime', title: '下次检测时间' },
+        {
+            title: '操作',
+            width: '180',
+            render: 'buttons',
+            fixed: 'right',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '下载原始数据报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.originalReport == null
+                    },
+                    click: row => {}
+                },
+                {
+                    name: 'edit',
+                    title: '下载检测报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.inspectionReport == null
+                    },
+                    click: row => {}
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data = [
+            {
+                status: 2
+            }
+        ]
+    }
+})
+
+tableStore.table.params.searchState = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.type = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/terminal/index.vue b/src/views/pqs/supervise/terminal/index.vue
index ee061c0f..79245494 100644
--- a/src/views/pqs/supervise/terminal/index.vue
+++ b/src/views/pqs/supervise/terminal/index.vue
@@ -1,20 +1,37 @@
 <template>
     <div class="default-main">
         <el-tabs v-model="activeName" type="border-card">
-            <el-tab-pane label="终端入网检测" name="1"></el-tab-pane>
-            <el-tab-pane label="终端周期检测" name="2"></el-tab-pane>
+            <el-tab-pane label="终端入网检测" name="1">
+                <!-- <network v-if="activeName == '1'" /> -->
+                <el-tabs v-model="network" type="border-card" style="height: 100%" tab-position="left">
+                    <el-tab-pane label="列表" name="1">
+                        <networkTab v-if="activeName == '1' && network == '1'" />
+                    </el-tab-pane>
+                    <el-tab-pane label="图表" name="2">Config</el-tab-pane>
+                </el-tabs>
+            </el-tab-pane>
+            <el-tab-pane label="终端周期检测" name="2">
+                <!-- <cycle v-if="activeName == '2'" /> -->
+                <el-tabs v-model="cycle" type="border-card" style="height: 100%" tab-position="left">
+                    <el-tab-pane label="列表" name="1"><cycleTab v-if="activeName == '2' && cycle == '1'"/></el-tab-pane>
+                    <el-tab-pane label="图表" name="2">Config</el-tab-pane>
+                </el-tabs>
+            </el-tab-pane>
         </el-tabs>
     </div>
 </template>
 
 <script setup lang="ts">
 import { onMounted, reactive, ref, provide } from 'vue'
-
+import networkTab from './components/networkTab.vue'
+import cycleTab from './components/cycleTab.vue'
 import { mainHeight } from '@/utils/layout'
 defineOptions({
     name: 'Processsupervision/Terminaldetection'
 })
 const activeName = ref('1')
+const network = ref('1')
+const cycle = ref('1')
 const Statistics = ref()
 const compatibility = ref()