联调设备文件

2026-03-30 09:03:53 +08:00
parent a30379ab01
commit 762965b1e4
11 changed files with 941 additions and 689 deletions
--- a/src/api/cs-device-boot/fileService.ts
+++ b/src/api/cs-device-boot/fileService.ts
@@ -15,7 +15,23 @@ export function getFileServiceFileOrDir(data) {
        method: 'POST'
    })
 }
-
+// 监测设备-目录信息询问
+export function listDir(data) {
+    return createAxios({
+        url: `/zl-event-boot/file/listDir`,
+        method: 'POST',
+        data: data
+    })
+}
+// 下载文件
+export function downloadFileFromFrontr(data: any) {
+    return createAxios({
+        url: `/zl-event-boot/file/downloadFileFromFront`,
+        method: 'POST',
+        data: data,
+        responseType: 'blob'
+    })
+}
 //设备文件下载
 export function downLoadDeviceFile(data) {
    return createAxios({
--- a/src/api/cs-system-boot/device.ts
+++ b/src/api/cs-system-boot/device.ts
@@ -85,7 +85,7 @@ export const portableDeviceRegister = (params: any) => {
 export const portableDeviceAccess = (data: any) => {
    return createAxios({
        url: `/access-boot/device/wlAccess?nDid=${data.nDid}`,
-        method: 'POST',
+        method: 'POST'
    })
 }
 // 下载模版
@@ -96,3 +96,10 @@ export function getExcelTemplate() {
        responseType: 'blob'
    })
 }
+// 查询工程信息列表
+export function engineeringProject() {
+    return createAxios({
+        url: '/cs-device-boot/engineeringProjectRelation/list',
+        method: 'post'
+    })
+}
--- a/src/components/tree/govern/csLedgerLineTree.vue
+++ b/src/components/tree/govern/csLedgerLineTree.vue
@@ -1,5 +1,13 @@
 <template>
-    <Tree ref="treRef" :width="width" :showPush="props.showPush"  :data="tree" default-expand-all @changePointType="changePointType" @onAdd="onAdd"/>
+    <Tree
+        ref="treRef"
+        :width="width"
+        :showPush="props.showPush"
+        :data="tree"
+        default-expand-all
+        @changePointType="changePointType"
+        @onAdd="onAdd"
+    />
 </template>

 <script lang="ts" setup>
@@ -29,20 +37,19 @@ const dictData = useDictData()
 const treRef = ref()
 const width = ref('')

-
 const info = (selectedNodeId?: string) => {
    tree.value = []
    let arr1: any[] = []
    lineTree().then(res => {
        try {
            // 检查响应数据结构
-            let rootData = null;
+            let rootData = null
            if (Array.isArray(res.data)) {
                // 旧的数据结构 - 数组
-                rootData = res.data.find((item: any) => item.name == '监测设备');
+                rootData = res.data.find((item: any) => item.name == '监测设备')
            } else if (res.data && res.data.name == '监测设备') {
                // 新的数据结构 - 单个对象
-                rootData = res.data;
+                rootData = res.data
            }

            // 治理设备
@@ -97,50 +104,51 @@ const info = (selectedNodeId?: string) => {
                tree.value = []
            }
            nextTick(() => {
-              
                if (arr1.length) {
                    // 安全检查 treRef 和 treeRef 是否存在
-                        console.log("🚀 ~ info ~ treRef.value && treRef.value.treeRef && treRef.value.treeRef.setCurrentKey:", treRef.value && treRef.value.treeRef1 && treRef.value.treeRef1.setCurrentKey)
+                    console.log(
+                        '🚀 ~ info ~ treRef.value && treRef.value.treeRef && treRef.value.treeRef.setCurrentKey:',
+                        treRef.value && treRef.value.treeRef1 && treRef.value.treeRef1.setCurrentKey
+                    )

                    if (treRef.value && treRef.value.treeRef && treRef.value.treeRef.setCurrentKey) {
                        // 如果传入了要选中的节点ID，则选中该节点，否则选中第一个节点
-                        console.log('selectedNodeId:', selectedNodeId);
+                        console.log('selectedNodeId:', selectedNodeId)
                        if (selectedNodeId) {
-                            treRef.value.treeRef.setCurrentKey(selectedNodeId);
+                            treRef.value.treeRef.setCurrentKey(selectedNodeId)
                            // 查找对应的节点数据并触发事件
-                            let selectedNode = null;
+                            let selectedNode = null
                            const findNode = (nodes: any[]) => {
                                for (const node of nodes) {
                                    if (node.id === selectedNodeId) {
-                                        selectedNode = node;
-                                        return true;
+                                        selectedNode = node
+                                        return true
                                    }
                                    if (node.children && findNode(node.children)) {
-                                        return true;
+                                        return true
                                    }
                                }
-                                return false;
-                            };
+                                return false
+                            }

-                            findNode(tree.value);
+                            findNode(tree.value)

                            if (selectedNode) {
                                emit('init', {
                                    level: selectedNode.level,
                                    ...selectedNode
-                                });
+                                })
                            }
                        } else {
                            // 初始化选中第一个节点
-                            treRef.value.treeRef.setCurrentKey(arr1[0].id);
+                            treRef.value.treeRef.setCurrentKey(arr1[0].id)
                            emit('init', {
                                level: 2,
                                ...arr1[0]
-                            });
+                            })
                        }
                    }
                } else {
-                  
                }
            })
        } catch (error) {
@@ -149,7 +157,6 @@ const info = (selectedNodeId?: string) => {
    })
 }

-
 const changePointType = (val: any, obj: any) => {
    emit('pointTypeChange', val, obj)
 }
@@ -158,7 +165,8 @@ const onAdd = () => {
    emit('onAdd')
 }
 if (props.template) {
-    querySysExcel({ id: dictData.state.area[0]?.id })
+    // id: dictData.state.area[0]?.id
+    querySysExcel({})
        .then((res: any) => {
            emit('Policy', res.data)
            info()
--- a/src/components/tree/govern/pointTree.vue
+++ b/src/components/tree/govern/pointTree.vue
@@ -188,7 +188,8 @@ const changePointType = (val: any, obj: any) => {
    emit('pointTypeChange', val, obj)
 }
 if (props.template) {
-    querySysExcel({ id: dictData.state.area[0]?.id })
+    // id: dictData.state.area[0]?.id
+    querySysExcel({})
        .then((res: any) => {
            emit('Policy', res.data)
            info()
--- a/src/components/tree/govern/pointTreeWx.vue
+++ b/src/components/tree/govern/pointTreeWx.vue
@@ -3,13 +3,7 @@
        <div style="transition: all 0.3s; overflow: hidden; height: 100%">
            <div class="cn-tree">
                <div style="display: flex; align-items: center" class="mb10">
-                    <el-input
-                        maxlength="32"
-                        
-                        v-model.trim="filterText"
-                        placeholder="请输入内容"
-                        clearable
-                    >
+                    <el-input maxlength="32" v-model.trim="filterText" placeholder="请输入内容" clearable>
                        <template #prefix>
                            <Icon name="el-icon-Search" style="font-size: 16px" />
                        </template>
@@ -37,7 +31,7 @@
                                    :style="{ color: data.color }"
                                    v-if="data.icon"
                                />
-                                <span style="margin-left: 5px;">{{ node.label }}</span>
+                                <span style="margin-left: 5px">{{ node.label }}</span>
                            </div>
                        </span>
                    </template>
@@ -157,7 +151,8 @@ const clickNode = (e: anyObj) => {
 }

 if (props.template) {
-    querySysExcel({ id: dictData.state.area[0]?.id })
+    // id: dictData.state.area[0]?.id
+    querySysExcel({})
        .then((res: any) => {
            emit('Policy', res.data)
            getTreeList()
--- a/src/utils/downloadFile.ts
+++ b/src/utils/downloadFile.ts
@@ -0,0 +1,103 @@
+import { ElMessage, ElMessageBox, ElInput, ElSegmented } from 'element-plus'
+export const downLoadFile = (name: string, key: string, res: any) => {
+    let blob = new Blob([res], {
+        type: getFileType(key)
+    })
+    const url = window.URL.createObjectURL(blob)
+    const link = document.createElement('a') // 创建a标签
+    link.href = url
+    link.download = name // 设置下载的文件名
+    document.body.appendChild(link)
+    link.click() //执行下载
+    document.body.removeChild(link)
+    ElMessage.success('下载成功')
+}
+
+const getFileType = (url: string) => {
+    const ext = url.split('.').pop()?.toLowerCase() || ''
+    const mimeMap: Record<string, string> = {
+        // Excel
+        xls: 'application/vnd.ms-excel',
+        xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        // CSV
+        csv: 'text/csv',
+        // Word
+        doc: 'application/msword',
+        docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        // PDF
+        pdf: 'application/pdf',
+        // PowerPoint
+        ppt: 'application/vnd.ms-powerpoint',
+        pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        // 图片
+        png: 'image/png',
+        gif: 'image/gif',
+        jpeg: 'image/jpeg',
+        jpg: 'image/jpeg',
+        bmp: 'image/bmp',
+        ico: 'image/vnd.microsoft.icon',
+        tif: 'image/tiff',
+        tiff: 'image/tiff',
+        svg: 'image/svg+xml',
+        webp: 'image/webp',
+        // 音频
+        mp3: 'audio/mpeg',
+        aac: 'audio/aac',
+        mid: 'audio/midi',
+        midi: 'audio/midi',
+        oga: 'audio/ogg',
+        wav: 'audio/wav',
+        weba: 'audio/webm',
+        // 视频
+        avi: 'video/x-msvideo',
+        mpeg: 'video/mpeg',
+        ogv: 'video/ogg',
+        webm: 'video/webm',
+        '3gp': 'video/3gpp',
+        '3g2': 'video/3gpp2',
+        // 网页/代码
+        html: 'text/html',
+        css: 'text/css',
+        js: 'text/javascript',
+        mjs: 'text/javascript',
+        json: 'application/json',
+        jsonld: 'application/ld+json',
+        xhtml: 'application/xhtml+xml',
+        xml: 'application/xml',
+        xul: 'application/vnd.mozilla.xul+xml',
+        // 文档
+        abw: 'application/x-abiword',
+        odp: 'application/vnd.oasis.opendocument.presentation',
+        ods: 'application/vnd.oasis.opendocument.spreadsheet',
+        odt: 'application/vnd.oasis.opendocument.text',
+        rtf: 'application/rtf',
+        txt: 'text/plain',
+        vsd: 'application/vnd.visio',
+        // 字体
+        otf: 'font/otf',
+        ttf: 'font/ttf',
+        woff: 'font/woff',
+        woff2: 'font/woff2',
+        eot: 'application/vnd.ms-fontobject',
+        // 压缩/归档
+        arc: 'application/x-freearc',
+        bz: 'application/x-bzip',
+        bz2: 'application/x-bzip2',
+        rar: 'application/x-rar-compressed',
+        tar: 'application/x-tar',
+        zip: 'application/zip',
+        '7z': 'application/x-7z-compressed',
+        // 其他
+        bin: 'application/octet-stream',
+        csh: 'application/x-csh',
+        epub: 'application/epub+zip',
+        azw: 'application/vnd.amazon.ebook',
+        ics: 'text/calendar',
+        jar: 'application/java-archive',
+        mpkg: 'application/vnd.apple.installer+xml',
+        ogx: 'application/ogg',
+        sh: 'application/x-sh',
+        swf: 'application/x-shockwave-flash'
+    }
+    return mimeMap[ext] || ''
+}
--- a/src/views/govern/device/fileService/index.vue
+++ b/src/views/govern/device/fileService/index.vue
@@ -2,7 +2,7 @@
 <template>
    <div class="default-main main" :style="{ height: pageHeight.height }">
        <div class="main_left">
-            <DeviceTree @node-click="nodeClick" @init="nodeClick"></DeviceTree>
+            <DeviceTree @node-click="nodeClick" @deviceTypeChange="deviceTypeChange"></DeviceTree>
        </div>
        <div class="main_right" v-loading="loading">
            <div class="right_nav">
@@ -197,22 +197,25 @@
 import DeviceTree from '@/components/tree/govern/deviceTree.vue'
 import { mainHeight } from '@/utils/layout'
 import { ref, watch, onMounted, onBeforeUnmount, h, inject } from 'vue'
-import { ElMessage, ElMessageBox, ElInput } from 'element-plus'
+import { ElMessage, ElMessageBox, ElInput, ElSegmented } from 'element-plus'
 import {
    getFileServiceFileOrDir,
    uploadDeviceFile,
    reStartDevice,
    addDeviceDir,
-    delDeviceDir
-} from '@/api/cs-device-boot/fileService.ts'
+    delDeviceDir,
+    listDir,
+    downloadFileFromFrontr
+} from '@/api/cs-device-boot/fileService'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { Delete, Download, Upload, Plus, Refresh, Search } from '@element-plus/icons-vue'
 import popup from './popup.vue'
 import mqtt from 'mqtt'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { passwordConfirm } from '@/api/user-boot/user'
+import { downLoadFile } from '@/utils/downloadFile.ts'
 defineOptions({
-    name: 'govern/device/fileService'
+    name: 'govern/device/fileService/index'
 })
 const pageHeight = mainHeight(20)
 const tableHeight = mainHeight(130)
@@ -220,19 +223,40 @@ const adminInfo = useAdminInfo()
 const loading = ref(false)
 //nDid
 const nDid = ref<string>('')
+const devId = ref<string>('')
 //当前目录
 const activePath = ref<string>('')
 //判断是否是根目录
 const isRoot = ref<boolean>(true)
 //储存所有点击过的目录
 const activePathList: any = ref([])
+const devConType = ref<string>('')
+const deviceTypeChange = (val: any, obj: any) => {
+    nodeClick(obj)
+}
 const nodeClick = (e: any) => {
    if (e && (e.level == 2 || e.type == 'device')) {
        loading.value = true
        nDid.value = e.ndid
+        devId.value = e.id
        dirList.value = []
        activePathList.value = []
        activePath.value = '/'
+        devConType.value = e.devConType
+        if (devConType.value == 'CLD') {
+            listDir({ devId: devId.value, filePath: activePath.value })
+                .then((resp: any) => {
+                    if (resp.code == 'A0000') {
+                        dirList.value = resp.data
+                        currentDirList.value = resp.data
+                        activePathList.value = [{ path: activePath.value }]
+                        loading.value = false
+                    }
+                })
+                .catch(e => {
+                    loading.value = false
+                })
+        } else {
            getFileServiceFileOrDir({ nDid: nDid.value, name: activePath.value, type: 'dir' })
                .then((resp: any) => {
                    if (resp.code == 'A0000') {
@@ -247,6 +271,7 @@ const nodeClick = (e: any) => {
                })
        }
    }
+}
 //搜索文件或文件夹
 const filterText = ref('')
 const handleSearch = () => {
@@ -360,6 +385,25 @@ const handleIntoDir = (row: any) => {
    if (activePathList.value.indexOf(obj.name) == -1) {
        activePathList.value.push({ path: obj.name })
    }
+
+    if (devConType.value == 'CLD') {
+        listDir({ devId: devId.value, filePath: row.prjDataPath })
+            .then((resp: any) => {
+                if (resp.code == 'A0000') {
+                    dirList.value = resp.data
+                    currentDirList.value = resp.data
+                    activePathList.value.map((item: any, index: any) => {
+                        if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
+                            activePathList.value.splice(index, 1)
+                        }
+                    })
+                    loading.value = false
+                }
+            })
+            .catch(e => {
+                loading.value = false
+            })
+    } else {
        getFileServiceFileOrDir(obj)
            .then(res => {
                dirList.value = res.data
@@ -376,6 +420,7 @@ const handleIntoDir = (row: any) => {
                loading.value = false
            })
    }
+}

 //处理导航栏路径
 const outPutPath = (row: any, key: any) => {
@@ -406,6 +451,24 @@ const handleIntoByPath = async (val: any) => {
    }
    activePath.value = val.path
    loading.value = true
+    if (devConType.value == 'CLD') {
+        listDir({ devId: devId.value, filePath: val.path })
+            .then((resp: any) => {
+                if (resp.code == 'A0000') {
+                    dirList.value = resp.data
+
+                    activePathList.value.map((item: any, index: any) => {
+                        if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
+                            activePathList.value.splice(index, 1)
+                        }
+                    })
+                    loading.value = false
+                }
+            })
+            .catch(e => {
+                loading.value = false
+            })
+    } else {
        getFileServiceFileOrDir(obj)
            .then(res => {
                dirList.value = res.data
@@ -420,6 +483,7 @@ const handleIntoByPath = async (val: any) => {
                loading.value = false
            })
    }
+}
 const form = ref({
    path: ''
 })
@@ -437,6 +501,27 @@ const formRef = ref()
 //重新加载当前页面菜单
 const reloadCurrentMenu = (msg: string) => {
    loading.value = true
+
+    if (devConType.value == 'CLD') {
+        listDir({ devId: devId.value, filePath: activePath.value })
+            .then((resp: any) => {
+                if (resp.code == 'A0000') {
+                    dirList.value = resp.data
+                    currentDirList.value = resp.data
+                    activePathList.value.map((item: any, index: any) => {
+                        if (item.path.includes(activePath.value) && item.path.length > activePath.value.length) {
+                            activePathList.value.splice(index, 1)
+                        }
+                    })
+                    loading.value = false
+                    if (!msg) return
+                    ElMessage({ message: msg, type: 'success', duration: 5000 })
+                }
+            })
+            .catch(e => {
+                loading.value = false
+            })
+    } else {
        getFileServiceFileOrDir({ nDid: nDid.value, name: activePath.value, type: 'dir' })
            .then((resp: any) => {
                if (resp.code == 'A0000') {
@@ -458,6 +543,7 @@ const reloadCurrentMenu = (msg: string) => {
                loading.value = false
            })
    }
+}
 //新建文件夹
 const submitDeviceDir = () => {
    formRef.value.validate((valid: any) => {
@@ -526,12 +612,22 @@ const changeType = ref<any>('')
 //下载文件
 const fileRef = ref()
 const handleDownLoad = async (row: any) => {
+    if (devConType.value == 'CLD') {
+        ElMessage.info('下载中，请稍等...')
+        downloadFileFromFrontr({
+            devId: devId.value,
+            filePath: row.prjDataPath
+        }).then(res => {
+            downLoadFile(row.name, row.name, res)
+        })
+    } else {
        ;(await nDid.value) && fileRef.value && fileRef.value.open(row, nDid.value)
        // fileName.value = row?.prjDataPath.split('/')[row?.prjDataPath.split('/').length - 1]
        // localStorage.setItem('fileName', fileName.value)
        changeType.value = 'download'
        localStorage.setItem('changeType', changeType.value)
    }
+}
 //上传文件
 const fileName = ref<any>('')
 const handleUpload = (e: any, fileList: any, row: any) => {
--- a/src/views/govern/manage/engineering/components/itemAdd.vue
+++ b/src/views/govern/manage/engineering/components/itemAdd.vue
@@ -118,12 +118,15 @@ const open = (text: string, List: any, data?: anyObj, id?: string) => {
    }
 }
 const submit = async () => {
+    if (form.topoIds == '') {
+        return ElMessage.warning('请选择拓扑图!')
+    }
    formRef.value.validate(async valid => {
        if (valid) {
            if (form.id) {
-                await updateProjects({ ...form, topoIds: form.topoIds == '' ? [] : [form.topoIds] })
+                await updateProjects({ ...form, topoIds: [form.topoIds] })
            } else {
-                await addProject({ ...form, topoIds: form.topoIds == '' ? [] : [form.topoIds] })
+                await addProject({ ...form, topoIds: [form.topoIds] })
            }
            ElMessage.success('保存成功')
            tableStore.index()
--- a/src/views/govern/manage/engineering/index.vue
+++ b/src/views/govern/manage/engineering/index.vue
@@ -43,7 +43,7 @@
                                    :preview-teleported="true"
                                    v-if="row.topologyInfo"
                                    :preview-src-list="[row.topologyImageUrl]"
-                                    :src="getUrl(row) ? row.topologyImageUrl : ''"
+                                    :src="row.topologyImageUrl"
                                ></el-image>
                                <span v-else>/</span>
                            </template>
@@ -199,6 +199,11 @@ const setTableRow = () => {
    let list = tableStore.table.data.filter((item: any) => item.engineeringId == engineeringId.value)
    tableRef.value.getRef().setCurrentRow(list[0] ?? {})
    itemList.value = list?.[0]?.projectInfoList ?? []
+    if (itemList.value.length > 0) {
+        itemList.value.forEach((item: any) => {
+            item.topologyImageUrl = getUrl(item)
+        })
+    }
 }
 // 修改模版
 const itemModification = (row: any) => {
@@ -223,6 +228,11 @@ const add = () => {
 const currentChange = (data: any) => {
    engineeringId.value = data.row.engineeringId
    itemList.value = data.row.projectInfoList
+    if (itemList.value.length > 0) {
+        itemList.value.forEach((item: any) => {
+            item.topologyImageUrl = getUrl(item)
+        })
+    }
 }
 // 保存模版
 const save = () => {
@@ -238,14 +248,11 @@ const save = () => {
 const imgList = ref([])
 // 获取拓扑图
 const getUrl = async (row: any) => {
-    if (!row.topologyInfo || row.topologyInfo === '/') return false
-    try {
+    if (!row.topologyInfo || row.topologyInfo === '/') return ''
+
    const res = await getFileUrl({ filePath: row.topologyInfo })
    row.topologyImageUrl = res.data
-        return true
-    } catch (error) {
-        return false
-    }
+    return res.data
 }

 onMounted(() => {
--- a/src/views/govern/manage/factory.vue
+++ b/src/views/govern/manage/factory.vue
@@ -164,6 +164,15 @@
                        <el-option label="CLD" value="CLD"></el-option>
                    </el-select>
                </el-form-item>
+                <el-form-item label="关联项目:" class="top">
+                    <el-cascader
+                        v-model.trim="form.association"
+                        filterable
+                        :options="engineeringList"
+                        :props="props"
+                        clearable
+                    />
+                </el-form-item>
                <el-form-item label="排序:" class="top" prop="sort">
                    <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
                </el-form-item>
@@ -198,7 +207,7 @@ import TableHeader from '@/components/table/header/index.vue'
 import { queryByCode, queryByid, queryCsDictTree } from '@/api/system-boot/dictTree'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { activateUser, deluser, passwordConfirm } from '@/api/user-boot/user'
-import { downLoadFile } from '@/api/cs-system-boot/manage.ts'
+import { downLoadFile } from '@/api/cs-system-boot/manage'
 import {
    addEquipmentDelivery,
    deleteEquipmentDelivery,
@@ -208,7 +217,8 @@ import {
    governDeviceRegister,
    portableDeviceRegister,
    portableDeviceAccess,
-    getExcelTemplate
+    getExcelTemplate,
+    engineeringProject
 } from '@/api/cs-system-boot/device'
 import html2canvas from 'html2canvas'
 import { fullUrl } from '@/utils/common'
@@ -221,17 +231,27 @@ const showQrCode = ref(false)
 const devTypeOptions: any = ref([])
 const devTypeOptions2: any = ref([])
 const devModelOptions2: any = ref([])
+const engineeringList: any = ref([])
+
 const deivce: any = ref({})
 const ruleFormRef = ref()
-const form = reactive({
+const form: any = reactive({
    cntractNo: '',
    devAccessMethod: 'MQTT',
    devModel: '',
    devType: '',
    name: '',
    ndid: '',
+    associatedEngineering: '',
+    associatedProject: '',
+    association: [],
    sort: 0
 })
+const props = {
+    label: 'projectName',
+    value: 'projectId',
+    children: 'projectInfoList'
+}
 const rules = reactive({
    name: [{ required: true, message: '请输入设备名', trigger: 'blur' }],
    ndid: [{ required: true, message: '请输入网络设备id', trigger: 'blur' }],
@@ -248,7 +268,8 @@ const dialogTitle = ref('新增设备')
 const loading = ref<boolean>(false)
 const devModelOptions: any = ref([])
 const queryTheDictionary = () => {
-        queryByCode('DEV_CLD').then(res => {
+    queryByCode('DEV_CLD')
+        .then(res => {
            devTypeOptions2.value = res.data
            return queryCsDictTree(res.data.id).then(res => {
                devModelOptions2.value = res.data.map((item: any) => {
@@ -259,7 +280,8 @@ const queryTheDictionary = () => {
                    }
                })
            })
-        }).then(() => {
+        })
+        .then(() => {
            queryByCode('Device_Type').then(async res => {
                const id = res.data.id
                await queryCsDictTree(id).then(res => {
@@ -292,10 +314,10 @@ const queryTheDictionary = () => {
                })
                await tableStore.index()
            })
-        }).catch(error => {
+        })
+        .catch(error => {
            console.error('查询过程中出现错误:', error)
        })
-   
 }
 const devModelOptionsFilter = computed(() => {
    return devModelOptions.value.filter((item: any) => {
@@ -327,7 +349,6 @@ const formDevModelOptionsFilter = computed(() => {
    }
 })

-
 const formDevTypeOptions = computed(() => {
    // 如果协议是CLD，使用devTypeOptions2，否则使用devTypeOptions
    if (form.devAccessMethod === 'CLD') {
@@ -367,8 +388,8 @@ const tableStore = new TableStore({
                }
                // 如果是MQTT协议，使用devTypeOptions查找
                else if (row.row.devAccessMethod === 'MQTT') {
-                    const item = devTypeOptions.value.find((item: any) => item.value == row.cellValue);
-                    return item ? item.label : '/';
+                    const item = devTypeOptions.value.find((item: any) => item.value == row.cellValue)
+                    return item ? item.label : '/'
                }
            },
            minWidth: 120
@@ -378,8 +399,8 @@ const tableStore = new TableStore({
            field: 'devModel',
            formatter: row => {
                const options = row.row.devAccessMethod === 'MQTT' ? devModelOptions.value : devModelOptions2.value
-                const item = options.find((item: any) => item.value == row.cellValue);
-                    return item ? item.label : '/';
+                const item = options.find((item: any) => item.value == row.cellValue)
+                return item ? item.label : '/'
            },
            minWidth: 120
        },
@@ -488,7 +509,8 @@ const tableStore = new TableStore({
            minWidth: 80
        },
        {
-            title: '操作', fixed: 'right',
+            title: '操作',
+            fixed: 'right',
            align: 'center',
            width: 220,
            render: 'buttons',
@@ -677,7 +699,6 @@ const tableStore = new TableStore({
                                useCORS: true
                            }).then(canvas => {
                                let url = canvas.toDataURL('image/png')
-                                console.log('🚀 ~ html2canvas ~ url:', url)
                                // 下载图片
                                let a = document.createElement('a')
                                let event = new MouseEvent('click')
@@ -701,6 +722,10 @@ const tableStore = new TableStore({
                        for (let key in form) {
                            form[key] = row[key]
                        }
+
+                        form.association = row.associatedProject
+                            ? [row.associatedEngineering, row.associatedProject]
+                            : []
                        form.id = row.id
                    }
                },
@@ -741,7 +766,6 @@ const tableStore = new TableStore({
                    : ''
            }
        })
-        console.log('🚀 ~ loadCallback ~ tableStore.table:', tableStore.table)
        tableKey.value += 1
    }
 })
@@ -877,6 +901,9 @@ const add = () => {
 const onSubmit = () => {
    ruleFormRef.value.validate((valid: any) => {
        if (valid) {
+            form.associatedEngineering = form.association ? form.association[0] : ''
+            form.associatedProject = form.association ? form.association[1] : ''
+
            if (dialogTitle.value == '新增设备') {
                addEquipmentDelivery(form).then(res => {
                    ElMessage.success('新增成功')
@@ -923,6 +950,9 @@ const resetForm = () => {
            devModel: '',
            devType: '',
            name: '',
+            associatedEngineering: '',
+            associatedProject: '',
+            association: [],
            ndid: ''
        }
        Object.assign(form, user)
@@ -939,6 +969,15 @@ provide('tableStore', tableStore)

 onMounted(() => {
    queryTheDictionary()
+    engineeringProject().then(res => {
+        engineeringList.value = res.data.filter(item => {
+            item.projectName = item.engineeringName
+            item.projectId = item.engineeringId
+            item.disabled = item.projectInfoList ? false : true
+            return item
+        })
+    })
+
    setTimeout(() => {}, 100)
 })

--- a/src/views/govern/reportForms/export.js
+++ b/src/views/govern/reportForms/export.js
@@ -31,7 +31,7 @@ const exportExcel = function(luckysheet, value) {
        const blob = new Blob([data], {
            type: 'application/vnd.ms-excel;charset=utf-8'
        })
-    console.log("导出成功！")
+        console.log('导出成功！')
        FileSaver.saveAs(blob, `${value}.xlsx`)
    })
    return buffer
@@ -42,12 +42,7 @@ var setMerge = function(luckyMerge = {}, worksheet) {
    mergearr.forEach(function (elem) {
        // elem格式：{r: 0, c: 0, rs: 1, cs: 2}
        // 按开始行，开始列，结束行，结束列合并（相当于 K10:M12）
-    worksheet.mergeCells(
-      elem.r + 1,
-      elem.c + 1,
-      elem.r + elem.rs,
-      elem.c + elem.cs
-    )
+        worksheet.mergeCells(elem.r + 1, elem.c + 1, elem.r + elem.rs, elem.c + elem.cs)
    })
 }

@@ -95,15 +90,7 @@ var setStyleAndValue = function(cellArr, worksheet) {
            if (!cell) return true
            let fill = fillConvert(cell.bg)

-      let font = fontConvert(
-        cell.ff,
-        cell.fc,
-        cell.bl,
-        cell.it,
-        cell.fs,
-        cell.cl,
-        cell.ul
-      )
+            let font = fontConvert(cell.ff, cell.fc, cell.bl, cell.it, cell.fs, cell.cl, cell.ul)
            let alignment = alignmentConvert(cell.vt, cell.ht, cell.tb, cell.tr)
            let value = ''

@@ -148,15 +135,7 @@ var fillConvert = function(bg) {
    return fill
 }

-var fontConvert = function(
-  ff = 0,
-  fc = '#000000',
-  bl = 0,
-  it = 0,
-  fs = 10,
-  cl = 0,
-  ul = 0
-) {
+var fontConvert = function (ff = 0, fc = '#000000', bl = 0, it = 0, fs = 10, cl = 0, ul = 0) {
    // luckysheet：ff(样式), fc(颜色), bl(粗体), it(斜体), fs(大小), cl(删除线), ul(下划线)
    const luckyToExcel = {
        0: '微软雅黑',
@@ -192,12 +171,7 @@ var fontConvert = function(
    return font
 }

-var alignmentConvert = function(
-  vt = 'default',
-  ht = 'default',
-  tb = 'default',
-  tr = 'default'
-) {
+var alignmentConvert = function (vt = 'default', ht = 'default', tb = 'default', tr = 'default') {
    // luckysheet:vt(垂直), ht(水平), tb(换行), tr(旋转)
    const luckyToExcel = {
        vertical: {
@@ -313,16 +287,21 @@ function addborderToCell(borders, row_index, col_index) {
    }
    // console.log('borders', borders)
    for (const bor in borders) {
-    // console.log(bor)
-    if (borders[bor].color.indexOf('rgb') === -1) {
+        const borderItem = borders[bor]
+        // 同时判断边框对象 和 color 属性都存在
+        if (!borderItem || !borderItem.color) {
+            continue
+        }
+
+        if (borderItem.color.indexOf('rgb') === -1) {
            border[luckyExcel.type[bor]] = {
-        style: luckyExcel.style[borders[bor].style],
-        color: { argb: borders[bor].color.replace('#', '') }
+                style: luckyExcel.style[borderItem.style],
+                color: { argb: borderItem.color.replace('#', '') }
            }
        } else {
            border[luckyExcel.type[bor]] = {
-        style: luckyExcel.style[borders[bor].style],
-        color: { argb: borders[bor].color }
+                style: luckyExcel.style[borderItem.style],
+                color: { argb: borderItem.color }
            }
        }
    }
@@ -344,6 +323,4 @@ function createCellPos(n) {
    return s
 }

-export {
-  exportExcel
-}
+export { exportExcel }