From b7547be989fe1d33796b94488808390b5667e65a Mon Sep 17 00:00:00 2001 From: zhujiyan <17812234322@163.com> Date: Fri, 12 Jul 2024 16:55:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 13 +- src/components/tree/govern/deviceInfoTree.vue | 1 + src/components/tree/govern/deviceTree.vue | 5 +- src/components/tree/govern/pointTree.vue | 8 +- src/components/tree/point.vue | 4 +- .../device/planData/components/popup.vue | 682 ++++++++---------- .../planData/components/treeTransfer.vue | 555 ++++++++++++++ .../planData/components/treeTransfers.vue | 252 +++++++ src/views/govern/device/planData/index.vue | 39 +- 10 files changed, 1151 insertions(+), 409 deletions(-) create mode 100644 src/views/govern/device/planData/components/treeTransfer.vue create mode 100644 src/views/govern/device/planData/components/treeTransfers.vue diff --git a/package.json b/package.json index 5483167..bb41cb8 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "file-saver": "v2.0.5", "html2canvas": "^1.4.1", "jquery": "^3.7.1", + "lodash": "^4.17.21", "lodash-es": "^4.17.21", "luckyexcel": "v1.0.1", "mitt": "^3.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1f6b251..7f48888 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,7 +43,7 @@ importers: version: echarts@4.9.0 element-plus: specifier: ^2.7.5 - version: 2.7.5(vue@3.3.13(typescript@5.3.3)) + version: 2.7.6(vue@3.3.13(typescript@5.3.3)) exceljs: specifier: v4.4.0 version: 4.4.0 @@ -56,6 +56,9 @@ importers: jquery: specifier: ^3.7.1 version: 3.7.1 + lodash: + specifier: ^4.17.21 + version: 4.17.21 lodash-es: specifier: ^4.17.21 version: 4.17.21 @@ -1007,8 +1010,8 @@ packages: electron-to-chromium@1.4.616: resolution: {integrity: sha512-1n7zWYh8eS0L9Uy+GskE0lkBUNK83cXTVJI0pU3mGprFsbfSdAc15VTFbo+A+Bq4pwstmL30AVcEU3Fo463lNg==} - element-plus@2.7.5: - resolution: {integrity: sha512-e4oqhfRGBpdblgsjEBK+tA2+fg1H1KZ2Qinty1SaJl0X49FrMLK0lpXQNheWyBqI4V/pyjVOF9sRjz2hfyoctw==, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.7.5.tgz} + element-plus@2.7.6: + resolution: {integrity: sha512-36sw1K23hYjgeooR10U6CiCaCp2wvOqwoFurADZVlekeQ9v5U1FhJCFGEXO6i/kZBBMwsE1c9fxjLs9LENw2Rg==, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.7.6.tgz} peerDependencies: vue: ^3.2.0 @@ -2753,7 +2756,7 @@ snapshots: electron-to-chromium@1.4.616: {} - element-plus@2.7.5(vue@3.3.13(typescript@5.3.3)): + element-plus@2.7.6(vue@3.3.13(typescript@5.3.3)): dependencies: '@ctrl/tinycolor': 3.6.1 '@element-plus/icons-vue': 2.3.1(vue@3.3.13(typescript@5.3.3)) @@ -3353,7 +3356,7 @@ snapshots: use-element-plus-theme@0.0.5(@types/node@20.10.5)(rollup@4.9.1)(typescript@5.3.3)(vite@5.0.10(@types/node@20.10.5)(sass@1.69.5)): dependencies: - element-plus: 2.7.5(vue@3.3.13(typescript@5.3.3)) + element-plus: 2.7.6(vue@3.3.13(typescript@5.3.3)) vite-plugin-dts: 3.7.0(@types/node@20.10.5)(rollup@4.9.1)(typescript@5.3.3)(vite@5.0.10(@types/node@20.10.5)(sass@1.69.5)) vue: 3.3.13(typescript@5.3.3) transitivePeerDependencies: diff --git a/src/components/tree/govern/deviceInfoTree.vue b/src/components/tree/govern/deviceInfoTree.vue index 52348ca..dc5827c 100644 --- a/src/components/tree/govern/deviceInfoTree.vue +++ b/src/components/tree/govern/deviceInfoTree.vue @@ -77,6 +77,7 @@ const getTreeList = (list:any) => { item3.color = config.getColorVal('elementUiPrimary') if (item3.comFlag === 1) { item3.color = '#e26257 !important' + item3.color = item3.comFlag == 3 ? '#e26257 !important' : config.getColorVal('elementUiPrimary') } arr.push(item3) }) diff --git a/src/components/tree/govern/deviceTree.vue b/src/components/tree/govern/deviceTree.vue index 0a9249e..1a95a02 100644 --- a/src/components/tree/govern/deviceTree.vue +++ b/src/components/tree/govern/deviceTree.vue @@ -58,9 +58,10 @@ getDeviceTree().then(res => { item.icon = 'el-icon-Platform' item.color = config.getColorVal('elementUiPrimary') item.color = '#e26257 !important' + item.color = item.comFlag === 3 ? config.getColorVal('elementUiPrimary') : '#e26257 !important' item.children.forEach((item2: any) => { item2.icon = 'el-icon-Platform' - item2.color = config.getColorVal('elementUiPrimary') + item2.color = item2.comFlag === 3 ? config.getColorVal('elementUiPrimary') : '#e26257 !important' // item2.children.forEach((item3: any) => { // item3.icon = 'el-icon-Platform' // item3.color = config.getColorVal('elementUiPrimary') @@ -76,7 +77,7 @@ getDeviceTree().then(res => { tree.value = res.data nextTick(() => { if (arr.length) { - console.log(treRef.value.treeRef1,"99999999"); + console.log(treRef.value.treeRef1, '99999999') treRef.value.treeRef1.setCurrentKey(arr[0].id) // 注册父组件事件 emit('init', { diff --git a/src/components/tree/govern/pointTree.vue b/src/components/tree/govern/pointTree.vue index 3772bb3..2e8a92c 100644 --- a/src/components/tree/govern/pointTree.vue +++ b/src/components/tree/govern/pointTree.vue @@ -43,10 +43,12 @@ getLineTree().then(res => { item.children.forEach((item: any) => { item.icon = 'el-icon-Platform' item.color = config.getColorVal('elementUiPrimary') + console.log(item.comFlag,"88888"); + item.color = item.comFlag === 3 ? config.getColorVal('elementUiPrimary') : '#e26257 !important' item.children.forEach((item2: any) => { - item2.icon = 'el-icon-Platform' - item2.color = config.getColorVal('elementUiPrimary') - item2.color = '#e26257 !important' + item2.icon = 'el-icon-Platform' + console.log(item2.comFlag,"88888"); + item2.color = item2.comFlag === 3 ? config.getColorVal('elementUiPrimary') : '#e26257 !important' arr2.push(item2) }) }) diff --git a/src/components/tree/point.vue b/src/components/tree/point.vue index ef1f6d7..ecbc452 100644 --- a/src/components/tree/point.vue +++ b/src/components/tree/point.vue @@ -34,7 +34,7 @@ + - -
- - - - - - -
+ + + + + +
- - - + - - - - -
- -
- - - -
-
- - - - - - - - - - - - - - -
-
-
- - - -
- -
-
- --> + +
+
+

未绑定

+ -
- - - + @checkChange="checkChange1" + ref="deviceInfoTreeRef1" + style="height: 320px; width: 390px; border: 0" + > + +
+ + 解绑 + + + 绑定 + + +
+
+

已绑定

+
- - + diff --git a/src/views/govern/device/planData/components/treeTransfers.vue b/src/views/govern/device/planData/components/treeTransfers.vue new file mode 100644 index 0000000..c501a42 --- /dev/null +++ b/src/views/govern/device/planData/components/treeTransfers.vue @@ -0,0 +1,252 @@ + + + + diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue index 4d42fb8..1400a63 100644 --- a/src/views/govern/device/planData/index.vue +++ b/src/views/govern/device/planData/index.vue @@ -92,8 +92,8 @@

历史趋势

- - + +
- - + +
- + { searchForm.value.index.map((item: any, indexs: any) => { indexOptions.value.map((vv: any) => { if (vv.id == item) { - chartTitle.value += indexs == searchForm.value.index.length - 1 ? vv.name : vv.name+ '/' + chartTitle.value += indexs == searchForm.value.index.length - 1 ? vv.name : vv.name + '/' } }) }) @@ -828,26 +837,26 @@ onMounted(() => {}) } } -.monitor_info { +::v-deep .monitor_info { width: 100%; -} -::v-deep .el-tabs__content { - padding: 0 !important; - max-height: 160px !important; -} + .el-tabs__content { + padding: 0 !important; + max-height: 160px !important; + } +} .history_header { display: flex; // flex-wrap: wrap; #history_select { - width: 90%; + width: 95%; display: flex; justify-content: flex-start; overflow: auto; // flex-wrap: wrap; .el-form-item { flex: none; - width: 380px !important; + max-width: 380px !important; } .el-select { margin-right: 10px;