联调算法库

修改冀北台账问题

src/views/pqs/business/terminal/deviceter/index.vue

@@ -2051,6 +2051,10 @@ const remove = () => {
         })
         return
     }
+    if (nodeData.value.id == null) {
+        ElMessage.warning('无法删除该节点')
+        return
+    }
     ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -2083,6 +2087,8 @@ const remove = () => {
 const next = async () => {
     await mainForm.value.validate((valid: any) => {
         if (valid) {
+            console.log("🚀 ~ awaitmainForm.value.validate ~ nodeLevel.value:", nodeLevel.value)
+
             switch (nodeLevel.value) {
                 case 100:
                     addProvince()
@@ -2317,6 +2323,12 @@ const getNodeIndex = () => {
 }
 /**查询节点内容 */
 const queryNodeContent = () => {
+    console.log("🚀 ~ queryNodeContent ~ nodeData.value:", nodeData.value)
+
+    if (nodeData.value.id == null) {
+        // ElMessage.warning('1111111')
+        return
+    }
     let data = {
         id: nodeData.value.id,
         level: nodeLevel.value

src/views/pqs/database/algorithm/components/addTree.vue

@@ -0,0 +1,95 @@
+<template>
+    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="700px">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="auto" :rules="rules" ref="formRef">
+                <el-form-item label="上级名称">
+                    <!-- <el-input v-model="form.pid" placeholder="上级名称" /> -->
+                    <el-tree-select
+                        v-model="form.pid"
+                        :data="dataTree"
+                        check-strictly
+                        clearable
+                        :render-after-expand="false"
+                        :props="defaultProps"
+                    />
+                </el-form-item>
+                <el-form-item label="名称" prop="name">
+                    <el-input v-model="form.name" placeholder="名称" />
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import { queryAllAlgorithmLibrary, addAlgorithm } from '@/api/supervision-boot/database/index'
+const dialogVisible = ref(false)
+const title = ref('')
+const emit = defineEmits(['getTree'])
+const formRef = ref()
+// 注意不要和表单ref的命名冲突
+const form = reactive<anyObj>({
+    name: '',
+    pid: ''
+})
+const defaultProps = {
+    children: 'children',
+    label: 'name',
+    value: 'id'
+}
+const rules = {
+    name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }]
+}
+const dataTree = ref([])
+const open = (text: string, data?: anyObj) => {
+    getTheTree()
+    title.value = text
+    dialogVisible.value = true
+    if (data) {
+        // 表单赋值
+        for (let key in form) {
+            form[key] = data[key]
+        }
+    } else {
+        // 在此处恢复默认表单
+        for (let key in form) {
+            form[key] = ''
+        }
+    }
+}
+const getTheTree = () => {
+    queryAllAlgorithmLibrary().then(res => {
+        res.data.forEach((item: any) => {
+            item.children.forEach((item2: any) => {
+                item2.childrens = item2.children
+                item2.children = []
+            })
+        })
+        dataTree.value = res.data
+    })
+}
+const submit = () => {
+    formRef.value.validate(async (valid: boolean) => {
+        if (valid) {
+            addAlgorithm({
+                pid: form.pid.length == 0 ? '' : form.pid,
+                name: form.name
+            }).then(res => {
+                ElMessage.success('新增成功')
+                emit('getTree')
+                dialogVisible.value = false
+            })
+        }
+    })
+}
+
+defineExpose({ open })
+</script>

src/views/pqs/database/algorithm/components/form.vue

@@ -2,21 +2,19 @@
     <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="700px">
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="auto" :rules="rules" ref="formRef">
-                <el-form-item label="算法名称">
+                <el-form-item label="算法名称" prop="name">
                     <el-input v-model="form.name" placeholder="请输入算法名称" />
                 </el-form-item>
-                <el-form-item label="定义">
-                    <el-input v-model="form.code" placeholder="请输入定义" />
+                <el-form-item label="计算周期" prop="period">
+                    <el-select v-model="form.period" placeholder="请选择计算周期" clearable>
+                        <el-option v-for="item in cycle" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
                 </el-form-item>
-                <el-form-item label="计算公式">
-                    <el-input v-model="form.remark" :rows="2" type="textarea" placeholder="请输入计算公式" />
+                <el-form-item label="数据来源" prop="source">
+                    <el-input v-model="form.source" placeholder="请输入数据来源" />
                 </el-form-item>
-
-                <el-form-item label="计算周期">
-                    <el-input v-model="form.code" placeholder="请输入计算周期" />
-                </el-form-item>
-                <el-form-item label="数据来源">
-                    <el-input v-model="form.code" placeholder="请输入数据来源" />
+                <el-form-item label="定义" prop="definition">
+                    <el-input v-model="form.definition" :rows="2" type="textarea" placeholder="请输入定义" />
                 </el-form-item>
             </el-form>
         </el-scrollbar>
@@ -32,50 +30,66 @@
 import { ref, inject } from 'vue'
 import { reactive } from 'vue'
 import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
-
+import { addAlgorithm, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
+const emit = defineEmits(['getTree'])
 const dialogVisible = ref(false)
 const title = ref('')
-const tableStore = inject('tableStore') as TableStore
 const formRef = ref()
+const List = ref({})
 // 注意不要和表单ref的命名冲突
 const form = reactive<anyObj>({
-    code: '',
     name: '',
-    remark: '',
-    id: ''
+    period: '',
+    definition: '',
+    source: ''
 })
 const rules = {
-    name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
-    code: [{ required: true, message: '角色编码不能为空', trigger: 'blur' }]
+    name: [{ required: true, message: '请输入算法名称', trigger: 'blur' }],
+    period: [{ required: true, message: '请选择计算周期', trigger: 'change' }],
+    definition: [{ required: true, message: '请输入定义', trigger: 'blur' }],
+    source: [{ required: true, message: '请输入数据来源', trigger: 'blur' }]
 }
+const cycle = [
+    { value: '0', label: '日' },
+    { value: '1', label: '月' },
+    { value: '2', label: '季' },
+    { value: '3', label: '年' }
+]
 
-const open = (text: string, data?: anyObj) => {
-    title.value = text
+const open = (row: any) => {
+    title.value = row.title
     dialogVisible.value = true
-    if (data) {
-        // 表单赋值
-        for (let key in form) {
-            form[key] = data[key]
-        }
-    } else {
+    List.value = row.row
+    if (row.title == '新增算法') {
         // 在此处恢复默认表单
         for (let key in form) {
             form[key] = ''
         }
+    } else {
+        // 表单赋值
+        for (let key in form) {
+            form[key] = row.row[key]
+        }
+        form.id = row.row.id
     }
 }
 const submit = () => {
     formRef.value.validate(async (valid: boolean) => {
         if (valid) {
-            if (form.id) {
+            if (title.value == '新增算法') {
                 // await update(form)
+                addAlgorithm({ ...form, pid: List.value?.id }).then(res => {
+                    ElMessage.success('新增成功')
+                    dialogVisible.value = false
+                    emit('getTree')
+                })
             } else {
-                // await create(form)
+                updateAlgorithmLibrary(form).then(res => {
+                    ElMessage.success('修改成功')
+                    dialogVisible.value = false
+                    emit('getTree')
+                })
             }
-            ElMessage.success('保存成功')
-            tableStore.index()
-            dialogVisible.value = false
         }
     })
 }

src/views/pqs/database/algorithm/index.vue

@@ -4,155 +4,190 @@
         <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
             <pane :size="size">
                 <algorithmTree
+                    ref="treeRef"
                     :default-expand-all="false"
                     :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
                     :current-node-key="monitoringPoint.state.lineId"
                     @node-click="handleNodeClick"
                     @init="handleNodeClick"
+                    @onAddTree="onAddTree"
                 ></algorithmTree>
             </pane>
             <pane style="background: #fff" :style="height">
-                <!-- <div :style="height"></div> -->
-                <TableHeader ref="TableHeaderRef" :show-search="false">
-                    <template v-slot:select>
-                        <el-radio-group v-model="tableStore.table.params.radio2" @change="tableStore.index()">
-                            <el-radio-button label="监测覆盖率" value="1" />
-                            <el-radio-button label="装置在线率" value="2" />
-                            <el-radio-button label="数据完整性" value="3" />
+                <div class="boxTop">
+                    <div>
+                        <el-radio-group v-model="radio">
+                            <el-radio-button v-for="(item, i) in dotList?.childrens" :label="item.name" :value="i" />
                         </el-radio-group>
-                    </template>
-                    <template #operation>
-                        <el-button icon="el-icon-Plus" type="primary" @click="addUser">新增</el-button>
-                    </template>
-                </TableHeader>
-                <Table ref="tableRef"></Table>
+                    </div>
+                    <div>
+                        <el-button
+                            icon="el-icon-Plus"
+                            type="primary"
+                            @click="addUser"
+                            v-if="dotList?.childrens?.length > 0"
+                        >
+                            新增
+                        </el-button>
+                    </div>
+                </div>
+
+                <div :style="heightTab">
+                    <vxe-table height="auto" v-bind="defaultAttribute" :data="dotList?.childrens[radio]?.children">
+                        <vxe-column field="name" title="算法名称"></vxe-column>
+                        <vxe-column field="createTime" title="创建时间"></vxe-column>
+                        <vxe-column field="definition" title="定义"></vxe-column>
+                        <vxe-column field="period" title="计算周期">
+                            <template #default="{ row }">
+                                {{
+                                    row.period == 0
+                                        ? '日'
+                                        : row.period == 1
+                                        ? '月'
+                                        : row.period == 2
+                                        ? '季'
+                                        : row.period == 3
+                                        ? '年'
+                                        : ''
+                                }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="source" title="数据来源"></vxe-column>
+                        <vxe-column field="useFLag" title="是否启用">
+                            <template #default="{ row }">
+                                <el-tag :type="row.useFLag === 1 ? 'success' : 'info'" effect="dark">
+                                    {{ row.useFLag === 1 ? '是' : '否' }}
+                                </el-tag>
+                            </template>
+                        </vxe-column>
+                        <vxe-column title="操作" width="150px">
+                            <template #default="{ row }">
+                                <el-button type="primary" link @click="edit(row)">修改</el-button>
+                                <!-- <el-button type="danger" link @click="del(row)">删除</el-button> -->
+                                <el-popconfirm title="是否确认删除算法?" @confirm="del(row)">
+                                    <template #reference>
+                                        <el-button type="danger" link>删除</el-button>
+                                    </template>
+                                </el-popconfirm>
+                            </template>
+                        </vxe-column>
+                    </vxe-table>
+                </div>
             </pane>
         </splitpanes>
+        <!-- 树弹框 -->
+        <addTree ref="addTreeRef" @getTree="treeRef.loadData(dotList.id)" />
         <!-- 弹框 -->
-        <PopupEdit ref="popupEditRef" />
+        <PopupEdit ref="popupEditRef" @getTree="treeRef.loadData(dotList.id)" />
     </div>
 </template>
 <script setup lang="ts">
 import { onMounted, ref, provide } from 'vue'
 import 'splitpanes/dist/splitpanes.css'
 import { Splitpanes, Pane } from 'splitpanes'
-import TableStore from '@/utils/tableStore'
 import algorithmTree from '@/components/tree/pqs/algorithmTree.vue'
-import TableHeader from '@/components/table/header/index.vue'
 import { mainHeight } from '@/utils/layout'
-import Table from '@/components/table/index.vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { getLineExport, getList, selectReleation } from '@/api/event-boot/report'
+import addTree from './components/addTree.vue'
 import PopupEdit from './components/form.vue'
 import { useMonitoringPoint } from '@/stores/monitoringPoint'
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { deleteyById } from '@/api/supervision-boot/database/index'
 defineOptions({
     name: 'database/algorithm'
 })
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
+const heightTab = mainHeight(82)
 const size = ref(0)
+const addTreeRef = ref()
+const treeRef = ref()
 const popupEditRef = ref()
 
 const TableHeaderRef = ref()
-const dotList: any = ref({
-    name: monitoringPoint.state.lineName.split('>')[3],
-    id: monitoringPoint.state.lineId,
-    level: 6
-})
+const dotList: any = ref()
 
 const templatePolicy: any = ref([])
-const tableStore = new TableStore({
-    url: '/user-boot/dept/deptTree',
-    method: 'POST',
-    column: [
-        { title: '算法名称', field: 'name' },
-        {
-            title: '定义',
-            field: 'name1'
-        },
-        {
-            title: '计算公式',
-            field: 'name2'
-        },
-        {
-            title: '计算周期',
-            field: 'name3'
-        },
-        {
-            title: '数据来源',
-            field: 'name4'
-        },
-        {
-            title: '是否启用',
-            field: 'name5',
-            render: 'tag',
-            effect: 'dark',
-            custom: {
-                0: 'info',
-                1: 'success'
-            },
-            replaceValue: {
-                0: '否',
-                1: '是'
-            }
-        }
-
-        // {
-        //     title: '操作',
-        //     align: 'center',
-        //     width: '180',
-        //     render: 'buttons',
-        //     buttons: [
-        //         {
-        //             name: 'edit',
-        //             title: '编辑',
-        //             type: 'primary',
-        //             icon: 'el-icon-EditPen',
-        //             render: 'basicButton',
-        //             click: async row => {}
-        //         }
-        //     ]
-        // }
-    ],
-    loadCallback: () => {
-        tableStore.table.data = [
-            {
-                name: '测试名称',
-                name1: 'xxx',
-                name2: 'XXX',
-                name3: '1月',
-                name4: '单体系统',
-                name5: '1'
-            },
-            {
-                name: '测试名称',
-                name1: 'xxx',
-                name2: 'XXX',
-                name3: '1月',
-                name4: '单体系统',
-                name5: '0'
-            }
-        ]
-    }
-})
-tableStore.table.params.radio2 = '1'
+// const tableStore = new TableStore({
+//     url: '/supervision-boot/libalgorithm/queryAllAlgorithmLibrary',
+//     method: 'GET',
+//     column: [
+//         { title: '算法名称', field: 'name' },
+//         {
+//             title: '定义',
+//             field: 'name1'
+//         },
+//         {
+//             title: '计算公式',
+//             field: 'name2'
+//         },
+//         {
+//             title: '计算周期',
+//             field: 'name3'
+//         },
+//         {
+//             title: '数据来源',
+//             field: 'name4'
+//         },
+//         {
+//             title: '是否启用',
+//             field: 'name5',
+//             render: 'tag',
+//             effect: 'dark',
+//             custom: {
+//                 0: 'info',
+//                 1: 'success'
+//             },
+//             replaceValue: {
+//                 0: '否',
+//                 1: '是'
+//             }
+//         }
+//     ],
+//     loadCallback: () => {}
+// })
+const radio = ref(0)
 
 // 弹框
 const addUser = () => {
-    popupEditRef.value.open('新增算法')
+    popupEditRef.value.open({
+        title: '新增算法',
+        row: dotList.value?.childrens[radio.value]
+    })
 }
 
-provide('tableStore', tableStore)
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
         size.value = Math.round((180 / dom.offsetHeight) * 100)
     }
-    tableStore.index()
+    // tableStore.index()
 })
 
 const handleNodeClick = (data: any, node: any) => {
-    dotList.value = data
+    console.log('🚀 ~ handleNodeClick ~ data:', data)
+    if (data.pid != '0') {
+        dotList.value = data
+        radio.value = 0
+    }
+}
+const onAddTree = () => {
+    addTreeRef.value.open('新增')
+}
+// 删除
+const del = (row: any) => {
+    deleteyById({ id: row.id }).then(res => {
+        ElMessage.success('删除成功')
+        treeRef.value.loadData()
+    })
+}
+// 修改
+const edit = (row: any) => {
+    popupEditRef.value.open({
+        title: '修改算法',
+        row: row
+    })
 }
 </script>
 <style lang="scss">
@@ -162,22 +197,7 @@ const handleNodeClick = (data: any, node: any) => {
 .grid-content {
     text-align: center;
 }
-.divBox {
-    width: 250px;
-    height: 31px;
-    margin: auto;
-    line-height: 32px;
-    border: 1px solid #c9c9c9;
-    &:hover {
-        border: 1px solid #002255;
-    }
-}
-.box {
-    padding: 10px;
-    // margin-top: 10px;
-    overflow-y: auto;
-    font-size: 15px;
-}
+
 .el-divider--horizontal {
     margin: 10px 0;
 }
@@ -185,4 +205,10 @@ const handleNodeClick = (data: any, node: any) => {
     margin-top: 5px;
     margin-bottom: 5px;
 }
+.boxTop {
+    height: 52px;
+    padding: 10px 10px 10px 0;
+    display: flex;
+    justify-content: space-between;
+}
 </style>

src/views/pqs/supervise/testRun/index.vue

@@ -257,7 +257,7 @@ onMounted(() => {
 const checkboxConfig = reactive<VxeTablePropTypes.CheckboxConfig>({
     labelField: '',
     checkMethod: ({ row }) => {
-        return !(row.testRunState == 1 || row.testRunState == 2)
+        return adminInfo.roleCode.includes('delete_info') || !(row.testRunState == 1 || row.testRunState == 2)
     }
 })
 const deleteEven = () => {