修改现场反馈问题

2024-10-10 10:46:10 +08:00
parent 0877ae5df0
commit facd4f55c5
12 changed files with 198 additions and 313 deletions
--- a/src/views/pqs/business/terminal/ProgramManagement/index.vue
+++ b/src/views/pqs/business/terminal/ProgramManagement/index.vue
@@ -64,7 +64,7 @@
                v-bind="defaultAttribute"
                :data="treeData"
                show-overflow
-                :tree-config="{ transform: true, parentField: 'pid' }"
+               :tree-config="{ transform: true, parentField: 'uPid',rowField:'uId' }"
                :scroll-y="{ enabled: true }"
            >
                <vxe-column field="name" align="left" title="电网拓扑" min-width="200" tree-node></vxe-column>
@@ -237,12 +237,12 @@ const tableStore = new TableStore({
    method: 'POST',
    column: [],
    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            if (item.children.length > 0) {
-                item.id = item.children[0].pid
-            }
-        })
-        treeData.value = tree2List(tableStore.table.data)
+        // tableStore.table.data.forEach((item: any) => {
+        //     if (item.children.length > 0) {
+        //         item.id = item.children[0].pid
+        //     }
+        // })
+        treeData.value = tree2List(tableStore.table.data, Math.random() * 1000)
        treeDataCopy.value = JSON.parse(JSON.stringify(treeData.value))
        setTimeout(() => {
            tableRef.value.setAllTreeExpand(true)
@@ -255,15 +255,21 @@ tableStore.table.params.program = ''
 tableStore.table.params.searchEvent = ''
 tableStore.table.params.filterName = ''
 provide('tableStore', tableStore)
-const tree2List = (list: any) => {
+
+
+
+const tree2List = (list: any, id: any) => {
    //存储结果的数组
    let arr: any = []
    // 遍历 tree 数组
    list.forEach((item: any) => {
+        item.uPid = id
+        item.uId = (Math.random() * 1000)
+       
        // 判断item是否存在children
        if (!item.children) return arr.push(item)
        // 函数递归，对children数组进行tree2List的转换
-        const children = tree2List(item.children)
+        const children = tree2List(item.children, item.uId)
        // 删除item的children属性
        delete item.children
        // 把item和children数组添加至结果数组
@@ -274,6 +280,7 @@ const tree2List = (list: any) => {
    return arr
 }

+
 tableStore.table.params.searchValue = ''
 tableStore.table.params.searchState = 0
 onMounted(() => {
--- a/src/views/pqs/business/terminal/TerminalManagement/index.vue
+++ b/src/views/pqs/business/terminal/TerminalManagement/index.vue
@@ -4,41 +4,25 @@
            <template #select>
                <el-form-item label="终端型号">
                    <el-select v-model="tableStore.table.params.devType" clearable placeholder="请选择终端型号">
-                        <el-option
-                            v-for="item in teriminaloption"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
+                        <el-option v-for="item in teriminaloption" :key="item.id" :label="item.name"
+                            :value="item.id"></el-option>
                    </el-select>
                </el-form-item>
                <el-form-item label="终端状态">
                    <el-select v-model="tableStore.table.params.runFlag" clearable placeholder="请选择终端状态">
-                        <el-option
-                            v-for="item in teriminalstatusoption"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
+                        <el-option v-for="item in teriminalstatusoption" :key="item.id" :label="item.name"
+                            :value="item.id"></el-option>
                    </el-select>
                </el-form-item>
                <el-form-item label="通讯状态">
                    <el-select v-model="tableStore.table.params.comFlag" clearable placeholder="请选择通讯状态">
-                        <el-option
-                            v-for="item in stateoption"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
+                        <el-option v-for="item in stateoption" :key="item.id" :label="item.name"
+                            :value="item.id"></el-option>
                    </el-select>
                </el-form-item>

                <el-form-item label="筛选">
-                    <el-input
-                        v-model="tableStore.table.params.filterName"
-                        @keyup="searchEvent"
-                        placeholder="输入关键字筛选"
-                    />
+                    <el-input v-model="tableStore.table.params.filterName" @keyup="searchEvent" placeholder="输入关键字筛选" />
                </el-form-item>
            </template>
            <template #operation>
@@ -52,26 +36,12 @@
            </template>
        </TableHeader>
        <div :style="`height: calc(${tableStore.table.height} + 58px)`">
-            <vxe-table
-                v-loading="tableStore.table.loading"
-                height="auto"
-                auto-resize
-                ref="tableRef"
-                v-bind="defaultAttribute"
-                :data="treeData"
-                show-overflow
-                :tree-config="{ transform: true, parentField: 'pid' }"
-                :scroll-y="{ enabled: true }"
-                :checkbox-config="{ labelField: 'name' }"
-            >
-                <vxe-column
-                    field="name"
-                    align="left"
-                    type="checkbox"
-                    title="电网拓扑"
-                    min-width="200"
-                    tree-node
-                ></vxe-column>
+            <vxe-table v-loading="tableStore.table.loading" height="auto" auto-resize ref="tableRef"
+                v-bind="defaultAttribute" :data="treeData" show-overflow
+                :tree-config="{ transform: true, parentField: 'uPid', rowField: 'uId' }" :scroll-y="{ enabled: true }"
+                :checkbox-config="{ labelField: 'name' }">
+                <vxe-column field="name" align="left" type="checkbox" title="电网拓扑" min-width="200"
+                    tree-node></vxe-column>
                <vxe-column field="devType" title="终端型号"></vxe-column>
                <vxe-column field="version" title="版本信息"></vxe-column>
                <vxe-column field="baseFlowMeal" title="基础套餐(MB)"></vxe-column>
@@ -122,25 +92,12 @@

                <vxe-column title="操作" min-width="100">
                    <template #default="{ row }">
-                        <el-button
-                            v-if="row.level === 4"
-                            type="primary"
-                            size="small"
-                            link
-                            @click="uesdealia(row)"
-                            icon="el-icon-view"
-                        >
+                        <el-button v-if="row.level === 4" type="primary" size="small" link @click="uesdealia(row)"
+                            icon="el-icon-view">
                            终端详情
                        </el-button>
-                        <el-button
-                            v-if="row.level === 4"
-                            :disabled="row.state == 1 ? true : false"
-                            type="primary"
-                            size="small"
-                            link
-                            icon="el-icon-view"
-                            @click="queryview(row)"
-                        >
+                        <el-button v-if="row.level === 4" :disabled="row.state == 1 ? true : false" type="primary"
+                            size="small" link icon="el-icon-view" @click="queryview(row)">
                            流量详情
                        </el-button>
                    </template>
@@ -148,14 +105,8 @@
            </vxe-table>
        </div>
        <!-- 终端使用详情 -->
-        <el-dialog
-            draggable
-            v-model="dialogVisiblexq"
-            v-if="dialogVisiblexq"
-            title="终端使用详情"
-            width="70%"
-            :before-close="handleClose"
-        >
+        <el-dialog draggable v-model="dialogVisiblexq" v-if="dialogVisiblexq" title="终端使用详情" width="70%"
+            :before-close="handleClose">
            <MyEchart :options="echartsXq" style="width: 100%; height: 300px" />
            <vxe-table v-bind="defaultAttribute" height="400" :data="logtableData">
                <vxe-colgroup title="cup使用率">
@@ -231,12 +182,8 @@ const tableStore = new TableStore({
    method: 'POST',
    column: [],
    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            if (item.children.length > 0) {
-                item.id = item.children[0].pid
-            }
-        })
-        treeData.value = tree2List(tableStore.table.data)
+
+        treeData.value = tree2List(tableStore.table.data, Math.random() * 1000)
        treeDataCopy.value = JSON.parse(JSON.stringify(treeData.value))
        setTimeout(() => {
            tableRef.value.setAllTreeExpand(true)
@@ -248,15 +195,18 @@ tableStore.table.params.runFlag = ''
 tableStore.table.params.comFlag = ''
 tableStore.table.params.filterName = ''
 // 处理大数据卡顿
-const tree2List = (list: any) => {
+const tree2List = (list: any, id: any) => {
    //存储结果的数组
    let arr: any = []
    // 遍历 tree 数组
    list.forEach((item: any) => {
+        item.uPid = id
+        item.uId = (Math.random() * 1000)
+
        // 判断item是否存在children
        if (!item.children) return arr.push(item)
        // 函数递归，对children数组进行tree2List的转换
-        const children = tree2List(item.children)
+        const children = tree2List(item.children, item.uId)
        // 删除item的children属性
        delete item.children
        // 把item和children数组添加至结果数组
@@ -275,15 +225,15 @@ onMounted(() => {
 })

 // 终端状态管理
-const deviceData = () => {}
+const deviceData = () => { }
 // 流量套餐配置
-const liuniangconfig = () => {}
+const liuniangconfig = () => { }
 // 流量策略配置
-const configliul = () => {}
+const configliul = () => { }
 // 流量统计
-const liultjData = () => {}
+const liultjData = () => { }
 // 重启前置程序
-const resect = () => {}
+const resect = () => { }

 // 终端详情
 const uesdealia = (row: any) => {
@@ -354,7 +304,7 @@ const uesdealia = (row: any) => {
    dialogVisiblexq.value = true
 }
 // 流量详情
-const queryview = (row: any) => {}
+const queryview = (row: any) => { }
 // 关闭
 const handleClose = () => {
    dialogVisible.value = false