From d5e65bafff7cfe6d4c01abc6aacfd6dd2c9285f6 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 19 Apr 2025 10:09:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/images/home/useUavHome/eventAggregationImg.png | 0
package-lock.json | 399 +++++++++++++++++++++++++++++++++++++++
src/assets/images/home/useUavHome/Group_1321315503.svg | 99 +++++++++
src/assets/images/home/useUavHome/eventAggregationImg1 (3).png | 0
docker-compose-prod.yml | 2
src/views/SignMachineNest/MachineRight/InspectionRaskList.vue | 37 +++
src/components/CurrentTaskDetails/TaskDetailsLeft.vue | 2
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 2
Dockerfile.prod | 7
9 files changed, 532 insertions(+), 16 deletions(-)
diff --git a/Dockerfile.prod b/Dockerfile.prod
index b961891..56e4385 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -1,17 +1,16 @@
# 使用官方的 Node.js 20.10.0 版本作为基础镜像
-FROM node:20-alpine AS build-env
+FROM node:20.18.3-alpine AS build-env
# 设置工作目录
WORKDIR /app
# 将当前目录（Vue 项目目录）的内容复制到 /app 目录中
-COPY . /app
-
+COPY . .
# 安装项目依赖
RUN rm -rf node_modules package-lock.json && npm install --registry=https://registry.npmmirror.com
# 构建项目
-RUN npm run build:dev
+RUN npm run build:test
# 查看
RUN ls /app/dist
\ No newline at end of file
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index d79ae1e..9a91b8a 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -1,7 +1,7 @@
version: '3.1'
services:
piloth5:
- image: 172.21.81.239:7666/drone-web/command-center-dashboard:SNAPSHOT-$BUILD_NUMBER
+ image: 172.21.81.239:7666/drone-web-prod/command-center-dashboard:SNAPSHOT-$BUILD_NUMBER
container_name: command-center-dashboard
ports:
- "8711:80"
diff --git a/package-lock.json b/package-lock.json
index 603d9d4..eaeb031 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,12 +24,16 @@
"disable-devtool": "^0.3.8",
"echarts": "^5.6.0",
"element-plus": "^2.9.3",
+ "eventemitter3": "^5.0.1",
"highlight.js": "^11.9.0",
+ "js-audio-recorder": "^1.0.7",
"js-base64": "^3.7.4",
"js-cookie": "^3.0.0",
"js-md5": "^0.7.3",
"jszip": "^3.10.1",
"lodash": "^4.17.21",
+ "mitt": "^3.0.1",
+ "mqtt": "^5.11.0",
"nprogress": "^0.2.0",
"postcss-pxtorem": "^6.1.0",
"reconnecting-websocket": "^4.4.0",
@@ -2267,6 +2271,20 @@
"undici-types": "~6.20.0"
}
},
+ "node_modules/@types/readable-stream": {
+ "version": "4.0.18",
+ "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.18.tgz",
+ "integrity": "sha512-21jK/1j+Wg+7jVw1xnSwy/2Q1VgVjWuFssbYGTREPUBeZ+rqVFl2udq0IkxzPC0ZhOzVceUbyIACFZKLqKEBlA==",
+ "dependencies": {
+ "@types/node": "*",
+ "safe-buffer": "~5.1.1"
+ }
+ },
+ "node_modules/@types/readable-stream/node_modules/safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+ },
"node_modules/@types/svgo": {
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/@types/svgo/-/svgo-2.6.4.tgz",
@@ -2287,6 +2305,14 @@
"resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
"integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==",
"license": "MIT"
+ },
+ "node_modules/@types/ws": {
+ "version": "8.18.1",
+ "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
+ "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
+ "dependencies": {
+ "@types/node": "*"
+ }
},
"node_modules/@uppy/companion-client": {
"version": "2.2.2",
@@ -2720,6 +2746,17 @@
"node": ">=16.5.0"
}
},
+ "node_modules/abort-controller": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+ "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+ "dependencies": {
+ "event-target-shim": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=6.5"
+ }
+ },
"node_modules/acorn": {
"version": "8.14.0",
"resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.14.0.tgz",
@@ -2992,6 +3029,25 @@
"node": ">=0.10.0"
}
},
+ "node_modules/base64-js": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ]
+ },
"node_modules/big.js": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -3005,6 +3061,32 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/bitmap-sdf/-/bitmap-sdf-1.0.4.tgz",
"integrity": "sha512-1G3U4n5JE6RAiALMxu0p1XmeZkTeCwGKykzsLTCqVzfSDaN6S7fKnkIkfejogz+iwqBWc0UYAIKnKHNN7pSfDg=="
+ },
+ "node_modules/bl": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.0.tgz",
+ "integrity": "sha512-ClDyJGQkc8ZtzdAAbAwBmhMSpwN/sC9HA8jxdYm6nVUbCfZbe2mgza4qh7AuEYyEPB/c4Kznf9s66bnsKMQDjw==",
+ "dependencies": {
+ "@types/readable-stream": "^4.0.0",
+ "buffer": "^6.0.3",
+ "inherits": "^2.0.4",
+ "readable-stream": "^4.2.0"
+ }
+ },
+ "node_modules/bl/node_modules/readable-stream": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+ "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+ "dependencies": {
+ "abort-controller": "^3.0.0",
+ "buffer": "^6.0.3",
+ "events": "^3.3.0",
+ "process": "^0.11.10",
+ "string_decoder": "^1.3.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ }
},
"node_modules/bluebird": {
"version": "3.7.2",
@@ -3059,11 +3141,33 @@
"node": ">=8"
}
},
+ "node_modules/buffer": {
+ "version": "6.0.3",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+ "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "dependencies": {
+ "base64-js": "^1.3.1",
+ "ieee754": "^1.2.1"
+ }
+ },
"node_modules/buffer-from": {
"version": "1.1.2",
"resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
- "dev": true,
"license": "MIT"
},
"node_modules/cache-base": {
@@ -3320,6 +3424,11 @@
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"license": "MIT"
},
+ "node_modules/commist": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/commist/-/commist-3.2.0.tgz",
+ "integrity": "sha512-4PIMoPniho+LqXmpS5d3NuGYncG6XWlkBSVGiWycL22dd42OYdUGil2CWuzklaJoNxyxUSpO4MKIBU94viWNAw=="
+ },
"node_modules/component-emitter": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
@@ -3340,6 +3449,20 @@
"resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
"integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==",
"license": "MIT"
+ },
+ "node_modules/concat-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
+ "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
+ "engines": [
+ "node >= 6.0"
+ ],
+ "dependencies": {
+ "buffer-from": "^1.0.0",
+ "inherits": "^2.0.3",
+ "readable-stream": "^3.0.2",
+ "typedarray": "^0.0.6"
+ }
},
"node_modules/concaveman": {
"version": "1.2.1",
@@ -3613,7 +3736,6 @@
"version": "4.4.0",
"resolved": "https://registry.npmmirror.com/debug/-/debug-4.4.0.tgz",
"integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
- "dev": true,
"license": "MIT",
"dependencies": {
"ms": "^2.1.3"
@@ -4211,6 +4333,27 @@
"es5-ext": "~0.10.14"
}
},
+ "node_modules/event-target-shim": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+ "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/eventemitter3": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+ "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA=="
+ },
+ "node_modules/events": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+ "engines": {
+ "node": ">=0.8.x"
+ }
+ },
"node_modules/expand-brackets": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -4324,6 +4467,18 @@
},
"engines": {
"node": ">=8.6.0"
+ }
+ },
+ "node_modules/fast-unique-numbers": {
+ "version": "8.0.13",
+ "resolved": "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-8.0.13.tgz",
+ "integrity": "sha512-7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g==",
+ "dependencies": {
+ "@babel/runtime": "^7.23.8",
+ "tslib": "^2.6.2"
+ },
+ "engines": {
+ "node": ">=16.1.0"
}
},
"node_modules/fastq": {
@@ -4812,6 +4967,11 @@
"he": "bin/he"
}
},
+ "node_modules/help-me": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz",
+ "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg=="
+ },
"node_modules/highlight.js": {
"version": "11.11.1",
"resolved": "https://registry.npmmirror.com/highlight.js/-/highlight.js-11.11.1.tgz",
@@ -4872,6 +5032,25 @@
"integrity": "sha512-XQ0yom/4KWTL29sLG+tyuycy7UmeaM/79GRtSJq6IG9cJGIPeBz5kwDCguie3TwxaMNIc3WtPi0cTa1XYHicpw==",
"license": "MIT"
},
+ "node_modules/ieee754": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+ "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ]
+ },
"node_modules/image-size": {
"version": "0.5.5",
"resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
@@ -4929,6 +5108,18 @@
},
"engines": {
"node": ">= 0.4"
+ }
+ },
+ "node_modules/ip-address": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+ "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+ "dependencies": {
+ "jsbn": "1.1.0",
+ "sprintf-js": "^1.1.3"
+ },
+ "engines": {
+ "node": ">= 12"
}
},
"node_modules/is-accessor-descriptor": {
@@ -5411,6 +5602,11 @@
"node": ">=0.10.0"
}
},
+ "node_modules/js-audio-recorder": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/js-audio-recorder/-/js-audio-recorder-1.0.7.tgz",
+ "integrity": "sha512-JiDODCElVHGrFyjGYwYyNi7zCbKk9va9C77w+zCPMmi4C6ix7zsX2h3ddHugmo4dOTOTCym9++b/wVW9nC0IaA=="
+ },
"node_modules/js-base64": {
"version": "3.7.7",
"resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.7.tgz",
@@ -5431,6 +5627,15 @@
"resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz",
"integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==",
"license": "MIT"
+ },
+ "node_modules/js-sdsl": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
+ "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/js-sdsl"
+ }
},
"node_modules/jsbn": {
"version": "1.1.0",
@@ -5643,6 +5848,11 @@
"resolved": "https://registry.npmjs.org/long/-/long-5.3.1.tgz",
"integrity": "sha512-ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng=="
},
+ "node_modules/lru-cache": {
+ "version": "10.4.3",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+ },
"node_modules/magic-string": {
"version": "0.30.17",
"resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.17.tgz",
@@ -5791,10 +6001,14 @@
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
- "dev": true,
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
+ },
+ "node_modules/mitt": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+ "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
},
"node_modules/mixin-deep": {
"version": "1.3.2",
@@ -5882,11 +6096,67 @@
"saxen": "^8.1.2"
}
},
+ "node_modules/mqtt": {
+ "version": "5.11.0",
+ "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-5.11.0.tgz",
+ "integrity": "sha512-VDqfADTNvohwcY02NgxPb7OojIeDrNQ1q62r/DcM+bnIWY8LBi3nMTvdEaFEp6Bu4ejBIpHjJVthUEgnvGLemA==",
+ "dependencies": {
+ "@types/readable-stream": "^4.0.18",
+ "@types/ws": "^8.5.14",
+ "commist": "^3.2.0",
+ "concat-stream": "^2.0.0",
+ "debug": "^4.4.0",
+ "help-me": "^5.0.0",
+ "lru-cache": "^10.4.3",
+ "minimist": "^1.2.8",
+ "mqtt-packet": "^9.0.2",
+ "number-allocator": "^1.0.14",
+ "readable-stream": "^4.7.0",
+ "reinterval": "^1.1.0",
+ "rfdc": "^1.4.1",
+ "socks": "^2.8.3",
+ "split2": "^4.2.0",
+ "worker-timers": "^7.1.8",
+ "ws": "^8.18.0"
+ },
+ "bin": {
+ "mqtt": "build/bin/mqtt.js",
+ "mqtt_pub": "build/bin/pub.js",
+ "mqtt_sub": "build/bin/sub.js"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/mqtt-packet": {
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.2.tgz",
+ "integrity": "sha512-MvIY0B8/qjq7bKxdN1eD+nrljoeaai+qjLJgfRn3TiMuz0pamsIWY2bFODPZMSNmabsLANXsLl4EMoWvlaTZWA==",
+ "dependencies": {
+ "bl": "^6.0.8",
+ "debug": "^4.3.4",
+ "process-nextick-args": "^2.0.1"
+ }
+ },
+ "node_modules/mqtt/node_modules/readable-stream": {
+ "version": "4.7.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz",
+ "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==",
+ "dependencies": {
+ "abort-controller": "^3.0.0",
+ "buffer": "^6.0.3",
+ "events": "^3.3.0",
+ "process": "^0.11.10",
+ "string_decoder": "^1.3.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ }
+ },
"node_modules/ms": {
"version": "2.1.3",
"resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
- "dev": true,
"license": "MIT"
},
"node_modules/namespace-emitter": {
@@ -6044,6 +6314,15 @@
},
"funding": {
"url": "https://github.com/fb55/nth-check?sponsor=1"
+ }
+ },
+ "node_modules/number-allocator": {
+ "version": "1.0.14",
+ "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.14.tgz",
+ "integrity": "sha512-OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA==",
+ "dependencies": {
+ "debug": "^4.3.1",
+ "js-sdsl": "4.3.0"
}
},
"node_modules/object-assign": {
@@ -6475,6 +6754,14 @@
"node": ">=6"
}
},
+ "node_modules/process": {
+ "version": "0.11.10",
+ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+ "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+ "engines": {
+ "node": ">= 0.6.0"
+ }
+ },
"node_modules/process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -6566,7 +6853,6 @@
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
- "dev": true,
"dependencies": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
@@ -6701,6 +6987,11 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/reinterval": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz",
+ "integrity": "sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ=="
+ },
"node_modules/repeat-element": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
@@ -6745,6 +7036,11 @@
"iojs": ">=1.0.0",
"node": ">=0.10.0"
}
+ },
+ "node_modules/rfdc": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+ "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA=="
},
"node_modules/robust-predicates": {
"version": "2.0.4",
@@ -6843,7 +7139,6 @@
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
- "dev": true,
"funding": [
{
"type": "github",
@@ -7156,6 +7451,15 @@
"jsbn": "^1.1.0"
}
},
+ "node_modules/smart-buffer": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+ "engines": {
+ "node": ">= 6.0.0",
+ "npm": ">= 3.0.0"
+ }
+ },
"node_modules/snabbdom": {
"version": "3.6.2",
"resolved": "https://registry.npmmirror.com/snabbdom/-/snabbdom-3.6.2.tgz",
@@ -7286,6 +7590,19 @@
"node": ">=0.10.0"
}
},
+ "node_modules/socks": {
+ "version": "2.8.4",
+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
+ "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
+ "dependencies": {
+ "ip-address": "^9.0.5",
+ "smart-buffer": "^4.2.0"
+ },
+ "engines": {
+ "node": ">= 10.0.0",
+ "npm": ">= 3.0.0"
+ }
+ },
"node_modules/sortablejs": {
"version": "1.14.0",
"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz",
@@ -7413,6 +7730,19 @@
"node": ">=0.10.0"
}
},
+ "node_modules/split2": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+ "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+ "engines": {
+ "node": ">= 10.x"
+ }
+ },
+ "node_modules/sprintf-js": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+ "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+ },
"node_modules/ssr-window": {
"version": "3.0.0",
"resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-3.0.0.tgz",
@@ -7477,7 +7807,6 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
- "dev": true,
"dependencies": {
"safe-buffer": "~5.2.0"
}
@@ -8123,6 +8452,11 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/typedarray": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+ "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
+ },
"node_modules/typedarray.prototype.slice": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz",
@@ -8701,6 +9035,57 @@
"integrity": "sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==",
"license": "MIT"
},
+ "node_modules/worker-timers": {
+ "version": "7.1.8",
+ "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.1.8.tgz",
+ "integrity": "sha512-R54psRKYVLuzff7c1OTFcq/4Hue5Vlz4bFtNEIarpSiCYhpifHU3aIQI29S84o1j87ePCYqbmEJPqwBTf+3sfw==",
+ "dependencies": {
+ "@babel/runtime": "^7.24.5",
+ "tslib": "^2.6.2",
+ "worker-timers-broker": "^6.1.8",
+ "worker-timers-worker": "^7.0.71"
+ }
+ },
+ "node_modules/worker-timers-broker": {
+ "version": "6.1.8",
+ "resolved": "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.1.8.tgz",
+ "integrity": "sha512-FUCJu9jlK3A8WqLTKXM9E6kAmI/dR1vAJ8dHYLMisLNB/n3GuaFIjJ7pn16ZcD1zCOf7P6H62lWIEBi+yz/zQQ==",
+ "dependencies": {
+ "@babel/runtime": "^7.24.5",
+ "fast-unique-numbers": "^8.0.13",
+ "tslib": "^2.6.2",
+ "worker-timers-worker": "^7.0.71"
+ }
+ },
+ "node_modules/worker-timers-worker": {
+ "version": "7.0.71",
+ "resolved": "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.71.tgz",
+ "integrity": "sha512-ks/5YKwZsto1c2vmljroppOKCivB/ma97g9y77MAAz2TBBjPPgpoOiS1qYQKIgvGTr2QYPT3XhJWIB6Rj2MVPQ==",
+ "dependencies": {
+ "@babel/runtime": "^7.24.5",
+ "tslib": "^2.6.2"
+ }
+ },
+ "node_modules/ws": {
+ "version": "8.18.1",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
+ "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==",
+ "engines": {
+ "node": ">=10.0.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": ">=5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
+ }
+ },
"node_modules/zrender": {
"version": "5.6.1",
"resolved": "https://registry.npmjs.org/zrender/-/zrender-5.6.1.tgz",
diff --git a/src/assets/images/home/useUavHome/Group_1321315503.svg b/src/assets/images/home/useUavHome/Group_1321315503.svg
new file mode 100644
index 0000000..2ed5523
--- /dev/null
+++ b/src/assets/images/home/useUavHome/Group_1321315503.svg
@@ -0,0 +1,99 @@
+<svg width="65" height="51" viewBox="0 0 65 51" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321315504">
+<g id="Vector">
+<path d="M46.1734 14.1245L35.6399 9.31365L40.1213 1.70947L50.6548 6.52028L46.1734 14.1245Z" fill="#DBA237"/>
+<path d="M46.1734 14.1245L35.6399 9.31365L40.1213 1.70947L50.6548 6.52028L46.1734 14.1245Z" fill="url(#paint0_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M46.1734 14.1245L35.6399 9.31365L40.1213 1.70947L50.6548 6.52028L46.1734 14.1245Z" fill="url(#paint1_linear_167_1217)" style="mix-blend-mode:overlay"/>
+</g>
+<g id="Vector_2">
+<path d="M50.6544 6.52037L40.1209 1.70957L53.7036 0.118896L64.2371 4.9297L50.6544 6.52037Z" fill="#B98B35"/>
+<path d="M50.6544 6.52037L40.1209 1.70957L53.7036 0.118896L64.2371 4.9297L50.6544 6.52037Z" fill="url(#paint2_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M50.6544 6.52037L40.1209 1.70957L53.7036 0.118896L64.2371 4.9297L50.6544 6.52037Z" fill="url(#paint3_linear_167_1217)" fill-opacity="0.5" style="mix-blend-mode:overlay"/>
+</g>
+<g id="Vector_3">
+<path d="M28.6635 16.2193L18.13 11.4085L35.6397 9.31348L46.1732 14.1243L28.6635 16.2193Z" fill="#B98B35"/>
+<path d="M28.6635 16.2193L18.13 11.4085L35.6397 9.31348L46.1732 14.1243L28.6635 16.2193Z" fill="url(#paint4_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M28.6635 16.2193L18.13 11.4085L35.6397 9.31348L46.1732 14.1243L28.6635 16.2193Z" fill="url(#paint5_linear_167_1217)" fill-opacity="0.5" style="mix-blend-mode:overlay"/>
+</g>
+<g id="Vector_4">
+<path d="M10.6457 11.2535L0.112183 6.44272L13.6949 4.85205L24.2284 9.66286L10.6457 11.2535Z" fill="#B98B35"/>
+<path d="M10.6457 11.2535L0.112183 6.44272L13.6949 4.85205L24.2284 9.66286L10.6457 11.2535Z" fill="url(#paint6_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M10.6457 11.2535L0.112183 6.44272L13.6949 4.85205L24.2284 9.66286L10.6457 11.2535Z" fill="url(#paint7_linear_167_1217)" fill-opacity="0.5" style="mix-blend-mode:overlay"/>
+</g>
+<g id="Vector_5">
+<path d="M37.3491 50.5939L26.8156 45.7831L0.112183 6.44312L10.6457 11.2539L37.3491 50.5939Z" fill="#B9831F"/>
+<path d="M37.3491 50.5939L26.8156 45.7831L0.112183 6.44312L10.6457 11.2539L37.3491 50.5939Z" fill="url(#paint8_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M37.3491 50.5939L26.8156 45.7831L0.112183 6.44312L10.6457 11.2539L37.3491 50.5939Z" fill="url(#paint9_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M37.3491 50.5939L26.8156 45.7831L0.112183 6.44312L10.6457 11.2539L37.3491 50.5939Z" fill="url(#paint10_linear_167_1217)" style="mix-blend-mode:overlay"/>
+</g>
+<g id="Vector_6">
+<path d="M37.3189 49.6584L11.522 11.6536L23.9839 10.1946L28.2496 16.5002L28.4205 16.7522L28.7232 16.7161L46.233 14.6213L46.4791 14.592L46.6041 14.3782L50.9595 6.98755L63.2955 5.54321L37.3189 49.6584Z" fill="#503C17"/>
+<path d="M37.3189 49.6584L11.522 11.6536L23.9839 10.1946L28.2496 16.5002L28.4205 16.7522L28.7232 16.7161L46.233 14.6213L46.4791 14.592L46.6041 14.3782L50.9595 6.98755L63.2955 5.54321L37.3189 49.6584Z" fill="url(#paint11_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M37.3189 49.6584L11.522 11.6536L23.9839 10.1946L28.2496 16.5002L28.4205 16.7522L28.7232 16.7161L46.233 14.6213L46.4791 14.592L46.6041 14.3782L50.9595 6.98755L63.2955 5.54321L37.3189 49.6584Z" fill="url(#paint12_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M37.3189 49.6584L11.522 11.6536L23.9839 10.1946L28.2496 16.5002L28.4205 16.7522L28.7232 16.7161L46.233 14.6213L46.4791 14.592L46.6041 14.3782L50.9595 6.98755L63.2955 5.54321L37.3189 49.6584Z" fill="url(#paint13_linear_167_1217)" style="mix-blend-mode:overlay"/>
+<path d="M37.3189 49.6584L11.522 11.6536L23.9839 10.1946L28.2496 16.5002L28.4205 16.7522L28.7232 16.7161L46.233 14.6213L46.4791 14.592L46.6041 14.3782L50.9595 6.98755L63.2955 5.54321L37.3189 49.6584Z" stroke="url(#paint14_linear_167_1217)" style="mix-blend-mode:overlay"/>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_167_1217" x1="43.1473" y1="1.70947" x2="43.1473" y2="14.1245" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_167_1217" x1="43.1473" y1="1.70947" x2="43.1473" y2="14.1245" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_167_1217" x1="52.179" y1="0.118896" x2="52.179" y2="6.52037" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint3_linear_167_1217" x1="52.179" y1="0.118896" x2="52.179" y2="6.52037" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint4_linear_167_1217" x1="32.1516" y1="9.31348" x2="32.1516" y2="16.2193" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint5_linear_167_1217" x1="32.1516" y1="9.31348" x2="32.1516" y2="16.2193" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint6_linear_167_1217" x1="12.1703" y1="4.85205" x2="12.1703" y2="11.2535" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint7_linear_167_1217" x1="12.1703" y1="4.85205" x2="12.1703" y2="11.2535" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint8_linear_167_1217" x1="18.7306" y1="6.44312" x2="18.7306" y2="50.5939" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint9_linear_167_1217" x1="18.7306" y1="6.44312" x2="18.7306" y2="50.5939" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint10_linear_167_1217" x1="18.7306" y1="6.44312" x2="18.7306" y2="50.5939" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint11_linear_167_1217" x1="37.4418" y1="4.92993" x2="37.4418" y2="50.5938" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint12_linear_167_1217" x1="37.4418" y1="4.92993" x2="37.4418" y2="50.5938" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint13_linear_167_1217" x1="37.4418" y1="4.92993" x2="37.4418" y2="50.5938" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint14_linear_167_1217" x1="37.4418" y1="4.92993" x2="37.4418" y2="50.5938" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/assets/images/home/useUavHome/eventAggregationImg.png b/src/assets/images/home/useUavHome/eventAggregationImg.png
index da133c4..1f5f09d 100644
--- a/src/assets/images/home/useUavHome/eventAggregationImg.png
+++ b/src/assets/images/home/useUavHome/eventAggregationImg.png
Binary files differ
diff --git "a/src/assets/images/home/useUavHome/eventAggregationImg1 \0503\051.png" "b/src/assets/images/home/useUavHome/eventAggregationImg1 \0503\051.png"
new file mode 100644
index 0000000..da133c4
--- /dev/null
+++ "b/src/assets/images/home/useUavHome/eventAggregationImg1 \0503\051.png"
Binary files differ
diff --git a/src/components/CurrentTaskDetails/TaskDetailsLeft.vue b/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
index 0e39eca..1625ddd 100644
--- a/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
+++ b/src/components/CurrentTaskDetails/TaskDetailsLeft.vue
@@ -273,7 +273,7 @@
getFileList();
}
-// 获取文件列表
+// 获取音频文件列表
function getFileList() {
getVoiceFile(searchParams.value).then((res) => {
if (res.data.code !== 0) return ElMessage.error(res.data.msg);
diff --git a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
index 4df6e24..0f3114e 100644
--- a/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
+++ b/src/views/SignMachineNest/MachineRight/InspectionRaskList.vue
@@ -22,7 +22,7 @@
:infinite-scroll-disabled="busy"
infinite-scroll-immediate="true">>
<div class="item" v-for="(item,index) in tableList">
- <div class="left">
+ <div class="left" @click="taskClick(item)">
<div class="left-t">
<span>{{ index+1 }}.</span>{{ item.name }}
<span class="status" :class="item.status===2?'active':''">
@@ -51,16 +51,34 @@
</el-empty>
</div>
</div>
+ <!-- 当前任务详情 -->
+ <CurrentTaskDetails
+ v-if="isShowCurrentTaskDetails"
+ v-model:show="isShowCurrentTaskDetails"
+ :id="currentInfoId"/>
+ <!-- 历史任务详情 -->
+ <DeviceJobDetails
+ v-if="isShowDeviceJobDetails"
+ v-model:show="isShowDeviceJobDetails"
+ :wayLineJodInfoId="wayLineJodInfoId"/>
</template>
<script setup>
import { Search } from '@element-plus/icons-vue';
import { ElMessage } from 'element-plus';
import CommonTitle from '@/components/CommonTitle.vue';
+import CurrentTaskDetails from '@/components/CurrentTaskDetails/CurrentTaskDetails.vue';
+import DeviceJobDetails from '@/components/DeviceJobDetails/DeviceJobDetails.vue'
import { getBeforeJob, getTodayJob, flyByJobId, returnHome } from '@/api/home';
import { useStore } from 'vuex';
const store = useStore();
+// 设备任务详情
+let currentInfoId = ref('');
+let isShowCurrentTaskDetails = ref(false);
+let wayLineJodInfoId = ref('');
+let isShowDeviceJobDetails = ref(false);
+
// 单个机巢信息
const singleUavHome = computed(() => store.state.home.singleUavHome);
@@ -166,6 +184,20 @@
});
};
+// 点击当前任务显示当前任务详情
+const taskClick = (item) => {
+ if (tabIndex.value === 1) {
+ // 展示当前任务详情
+ currentInfoId.value = item.wayline_job_info_id;
+ isShowCurrentTaskDetails.value = true;
+ } else {
+ // 展示历史任务详情
+ wayLineJodInfoId.value = item.wayline_job_info_id;
+ isShowDeviceJobDetails.value = true;
+ }
+
+};
+
onMounted(() => {
getJobList();
});
@@ -252,8 +284,9 @@
color: #fff;
display: flex;
justify-content: space-between;
-background: linear-gradient( 90deg, rgba(71,157,255,0) 0%, rgba(71, 157, 255, 0.12) 50%, rgba(71,157,255,0) 100%);
+ background: linear-gradient( 90deg, rgba(71,157,255,0) 0%, rgba(71, 157, 255, 0.12) 50%, rgba(71,157,255,0) 100%);
.left {
+ cursor: pointer;
.left-t {
height: 24px;
font-size: 16px;
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index 8ed3524..2463a6a 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -63,7 +63,7 @@
v-if="isShowCurrentTaskDetails"
v-model:show="isShowCurrentTaskDetails"
:id="rowData.id"/>
- <!-- 历史人物详情 -->
+ <!-- 历史任务详情 -->
<DeviceJobDetails
v-if="isShowDeviceJobDetails"
v-model:show="isShowDeviceJobDetails"
--
Gitblit v1.9.3