From d04336e1c85c4a3da74f00b8c4ab33b7d3f91dc2 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 8 Aug 2024 12:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=98=E7=94=B5?=
=?UTF-8?q?=E7=AB=99=E6=80=BB=E6=95=B0=E9=87=8F=20=E8=B6=8B=E5=8A=BF?=
=?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 170 +++++++++---------
.../panorama/components/details/point.vue | 7 +-
.../panorama/components/details/stand.vue | 5 +-
.../panorama/components/details/terminal.vue | 5 +-
4 files changed, 96 insertions(+), 91 deletions(-)
diff --git a/package.json b/package.json
index ae2fe2eb..6178baaa 100644
--- a/package.json
+++ b/package.json
@@ -1,86 +1,88 @@
{
- "name": "canneng-admin",
- "private": true,
- "version": "0.0.0",
- "type": "module",
- "scripts": {
- "dev": "vite",
- "build": "vite build ",
- "preview": "vite preview"
- },
- "dependencies": {
- "@ant-design/colors": "^7.0.2",
- "@element-plus/icons-vue": "^2.3.1",
- "@form-create/designer": "^3.1.3",
- "@form-create/element-ui": "^3.1.24",
- "@fortawesome/fontawesome-free": "^6.5.1",
- "@vue-office/docx": "^1.6.2",
- "@vue-office/excel": "^1.7.8",
- "@vue-office/pdf": "^2.0.2",
- "@vueuse/core": "^10.7.0",
- "@wangeditor/editor": "^5.1.23",
- "@wangeditor/editor-for-vue": "^5.1.12",
- "axios": "^1.6.2",
- "bpmn-js": "8.9.0",
- "bpmn-js-properties-panel": "0.46.0",
- "bpmn-js-token-simulation": "^0.10.0",
- "bpmn-moddle": "^6.0.0",
- "camunda-bpmn-moddle": "^7.0.1",
- "crypto-js": "^4.2.0",
- "dayjs": "^1.11.10",
- "diagram-js": "^11.4.1",
- "diagram-js-minimap": "^2.0.4",
- "echarts": "^5.4.3",
- "echarts-gl": "^2.0.9",
- "echarts-liquidfill": "^3.1.0",
- "echarts4": "npm:echarts@^4.9.0",
- "element-plus": "^2.7.2",
- "exceljs": "^4.4.0",
- "file-saver": "^2.0.5",
- "html2canvas": "^1.4.1",
- "jquery": "^3.7.1",
- "js-pinyin": "^0.2.5",
- "jsencrypt": "^3.3.2",
- "less": "^4.2.0",
- "lodash-es": "^4.17.21",
- "luckyexcel": "^1.0.1",
- "luckysheet": "^2.1.13",
- "min-dash": "^4.2.1",
- "mitt": "^3.0.1",
- "nprogress": "^0.2.0",
- "pinia": "^2.1.7",
- "pinia-plugin-persistedstate": "^3.2.1",
- "qs": "^6.12.0",
- "screenfull": "^6.0.2",
- "splitpanes": "^3.1.5",
- "steady-xml": "0.1.0",
- "use-element-plus-theme": "^0.0.5",
- "vue": "^3.3.11",
- "vue-baidu-map-3x": "^1.0.35",
- "vue-baidu-map-offline": "^1.0.7",
- "vue-demi": "^0.14.8",
- "vue-draggable-resizable": "3.0.0-beta.2",
- "vue-i18n": "9.10.2",
- "vue-router": "4",
- "vue-types": "^5.1.1",
- "vxe-table": "^4.5.17",
- "vxe-table-plugin-export-xlsx": "^4.0.1",
- "web-storage-cache": "^1.1.1",
- "xe-utils": "^3.5.14",
- "yarn": "^1.22.22"
- },
- "devDependencies": {
- "@purge-icons/generated": "^0.9.0",
- "@types/lodash-es": "^4.17.12",
- "@types/node": "^20.10.5",
- "@types/splitpanes": "^2.2.6",
- "@vitejs/plugin-vue": "^4.5.2",
- "@vitejs/plugin-vue-jsx": "^3.1.0",
- "sass": "^1.69.5",
- "typescript": "^5.2.2",
- "unplugin-auto-import": "^0.16.7",
- "vite": "^5.0.8",
- "vite-plugin-mkcert": "^1.17.3",
- "vue-tsc": "^1.8.25"
- }
+ "name": "canneng-admin",
+ "private": true,
+ "version": "0.0.0",
+ "type": "module",
+ "scripts": {
+ "dev": "vite --mode dev",
+ "dev:jibei": "vite --mode jibei",
+ "build": "vite build --mode dev",
+ "build:jibei": "vite build --mode jibei",
+ "preview": "vite preview"
+ },
+ "dependencies": {
+ "@ant-design/colors": "^7.0.2",
+ "@element-plus/icons-vue": "^2.3.1",
+ "@form-create/designer": "^3.1.3",
+ "@form-create/element-ui": "^3.1.24",
+ "@fortawesome/fontawesome-free": "^6.5.1",
+ "@vue-office/docx": "^1.6.2",
+ "@vue-office/excel": "^1.7.8",
+ "@vue-office/pdf": "^2.0.2",
+ "@vueuse/core": "^10.7.0",
+ "@wangeditor/editor": "^5.1.23",
+ "@wangeditor/editor-for-vue": "^5.1.12",
+ "axios": "^1.6.2",
+ "bpmn-js": "8.9.0",
+ "bpmn-js-properties-panel": "0.46.0",
+ "bpmn-js-token-simulation": "^0.10.0",
+ "bpmn-moddle": "^6.0.0",
+ "camunda-bpmn-moddle": "^7.0.1",
+ "crypto-js": "^4.2.0",
+ "dayjs": "^1.11.10",
+ "diagram-js": "^11.4.1",
+ "diagram-js-minimap": "^2.0.4",
+ "echarts": "^5.4.3",
+ "echarts-gl": "^2.0.9",
+ "echarts-liquidfill": "^3.1.0",
+ "echarts4": "npm:echarts@^4.9.0",
+ "element-plus": "^2.7.2",
+ "exceljs": "^4.4.0",
+ "file-saver": "^2.0.5",
+ "html2canvas": "^1.4.1",
+ "jquery": "^3.7.1",
+ "js-pinyin": "^0.2.5",
+ "jsencrypt": "^3.3.2",
+ "less": "^4.2.0",
+ "lodash-es": "^4.17.21",
+ "luckyexcel": "^1.0.1",
+ "luckysheet": "^2.1.13",
+ "min-dash": "^4.2.1",
+ "mitt": "^3.0.1",
+ "nprogress": "^0.2.0",
+ "pinia": "^2.1.7",
+ "pinia-plugin-persistedstate": "^3.2.1",
+ "qs": "^6.12.0",
+ "screenfull": "^6.0.2",
+ "splitpanes": "^3.1.5",
+ "steady-xml": "0.1.0",
+ "use-element-plus-theme": "^0.0.5",
+ "vue": "^3.3.11",
+ "vue-baidu-map-3x": "^1.0.35",
+ "vue-baidu-map-offline": "^1.0.7",
+ "vue-demi": "^0.14.8",
+ "vue-draggable-resizable": "3.0.0-beta.2",
+ "vue-i18n": "9.10.2",
+ "vue-router": "4",
+ "vue-types": "^5.1.1",
+ "vxe-table": "^4.5.17",
+ "vxe-table-plugin-export-xlsx": "^4.0.1",
+ "web-storage-cache": "^1.1.1",
+ "xe-utils": "^3.5.14",
+ "yarn": "^1.22.22"
+ },
+ "devDependencies": {
+ "@purge-icons/generated": "^0.9.0",
+ "@types/lodash-es": "^4.17.12",
+ "@types/node": "^20.10.5",
+ "@types/splitpanes": "^2.2.6",
+ "@vitejs/plugin-vue": "^4.5.2",
+ "@vitejs/plugin-vue-jsx": "^3.1.0",
+ "sass": "^1.69.5",
+ "typescript": "^5.2.2",
+ "unplugin-auto-import": "^0.16.7",
+ "vite": "^5.0.8",
+ "vite-plugin-mkcert": "^1.17.3",
+ "vue-tsc": "^1.8.25"
+ }
}
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/point.vue b/src/views/pqs/qualityInspeection/panorama/components/details/point.vue
index 66de3384..88620c74 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/point.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/point.vue
@@ -42,7 +42,7 @@
-
+
@@ -68,6 +68,7 @@ const trendEChart: any = ref()
const picEChart = ref()
const open = async (row: any) => {
+ time.value = '1'
rowList.value = {
deviceInfoParam: {
...row
@@ -99,8 +100,8 @@ const analysis = (e: any) => {
let num = 0
for (let k in res.data) {
name.push(k)
- num = num + res.data[k]
- data.push(num)
+ // num = num + res.data[k]
+ data.push(res.data[k])
}
trendEChart.value = {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
index b2f2d6da..41d090ba 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
@@ -101,6 +101,7 @@ const tableData: any = ref([])
const picEChart: any = ref([{}, {}, {}, {}, {}])
const open = async (row: any) => {
+ time.value = '1'
rowList.value = {
deviceInfoParam: {
...row
@@ -289,8 +290,8 @@ const analysis = (e: any) => {
let num = 0
for (let k in res.data) {
name.push(k)
- num = num + res.data[k]
- data.push(num)
+ // num = num + res.data[k]
+ data.push(res.data[k])
}
trendEChart.value = {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
index 73a1e783..1f321d51 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
@@ -84,6 +84,7 @@ const trendEChart: any = ref({})
const picEChart = ref()
const open = async (row: any) => {
+ time.value = '1'
rowList.value = {
deviceInfoParam: {
...row
@@ -184,8 +185,8 @@ const analysis = (e: any) => {
let num = 0
for (let k in res.data) {
name.push(k)
- num = num + res.data[k]
- data.push(num)
+ // num = num + res.data[k]
+ data.push(res.data[k])
}
trendEChart.value = {