From 00bd04c0da161b1166695270ba7cacd118b17429 Mon Sep 17 00:00:00 2001 From: waibao2 <1@qq.com> Date: Mon, 1 Dec 2025 14:56:12 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=9B=A8=E9=87=8F=E7=AD=89=E5=80=BC?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 12 +- src/assets/file/kriging.js | 28 +- src/views/report/dzm/index.vue | 2059 ++++++++++++++++---------------- 3 files changed, 1019 insertions(+), 1080 deletions(-) diff --git a/package.json b/package.json index 0307c0c..0ef2583 100644 --- a/package.json +++ b/package.json @@ -17,15 +17,18 @@ }, "dependencies": { "@element-plus/icons-vue": "2.3.1", - "@turf/turf": "^7.2.0", + "@turf/turf": "6.5.0", "@vueup/vue-quill": "1.2.0", "@vueuse/core": "10.6.1", + "autofit.js": "^3.2.8", "axios": "0.27.2", "dayjs": "^1.11.18", + "docxtemplater": "^3.67.5", "echarts": "5.4.3", "element-plus": "2.4.3", - "file-saver": "2.0.5", + "file-saver": "^2.0.5", "fuse.js": "6.6.2", + "html-docx-js": "^0.3.1", "html2pdf.js": "^0.12.1", "js-cookie": "3.0.5", "jsencrypt": "3.3.2", @@ -33,9 +36,10 @@ "leaflet.sidepanel": "^1.2.3", "lodash": "^4.17.21", "nprogress": "0.2.0", - "ol": "^10.6.1", + "ol": "^7.2.0", "pinia": "2.1.7", - "proj4": "^2.19.10", + "pizzip": "^3.2.0", + "proj4": "^2.11.0", "splitpanes": "^4.0.4", "vue": "3.3.9", "vue-cropper": "1.1.1", diff --git a/src/assets/file/kriging.js b/src/assets/file/kriging.js index 1ef0c54..f792a42 100644 --- a/src/assets/file/kriging.js +++ b/src/assets/file/kriging.js @@ -36,7 +36,7 @@ var kriging = function () { // Matrix algebra var kriging_matrix_diag = function (c, n) { var Z = createArrayWithValues(0, n * n); - for (i = 0; i < n; i++) Z[i * n + i] = c; + for (var i = 0; i < n; i++) Z[i * n + i] = c; return Z; }; var kriging_matrix_transpose = function (X, n, m) { @@ -59,26 +59,19 @@ var kriging = function () { Z[i * m + j] = X[i * m + j] + Y[i * m + j]; return Z; }; - // Naive matrix multiplication - var kriging_matrix_chol = function (X, n) { - var i, j, k, sum, p = Array(n); - for (i = 0; i < n; i++) p[i] = X[i * n + i]; + var kriging_matrix_multiply = function (X, Y, n, m, p) { + var i, j, k, Z = Array(n * p); for (i = 0; i < n; i++) { - for (j = 0; j < i; j++) - p[i] -= X[i * n + j] * X[i * n + j]; - if (p[i] <= 0) return false; - p[i] = Math.sqrt(p[i]); - for (j = i + 1; j < n; j++) { - for (k = 0; k < i; k++) - X[j * n + i] -= X[j * n + k] * X[i * n + k]; - X[j * n + i] /= p[i]; + for (j = 0; j < p; j++) { + Z[i * p + j] = 0; + for (k = 0; k < m; k++) + Z[i * p + j] += X[i * m + k] * Y[k * p + j]; } } - for (i = 0; i < n; i++) X[i * n + i] = p[i]; - return true; + return Z; }; - // Cholesky decomposition - kriging_matrix_chol = function (X, n) { + // Naive matrix multiplication + var kriging_matrix_chol = function (X, n) { var i, j, k, sum, p = Array(n); for (i = 0; i < n; i++) p[i] = X[i * n + i]; for (i = 0; i < n; i++) { @@ -95,6 +88,7 @@ var kriging = function () { for (i = 0; i < n; i++) X[i * n + i] = p[i]; return true; }; + // Inversion of cholesky decomposition var kriging_matrix_chol2inv = function (X, n) { var i, j, k, sum; diff --git a/src/views/report/dzm/index.vue b/src/views/report/dzm/index.vue index 8d8a91f..64e2024 100644 --- a/src/views/report/dzm/index.vue +++ b/src/views/report/dzm/index.vue @@ -2,11 +2,11 @@
- 导出图片 + 导出图片
- +
插值点方案 新增插值点方案 @@ -22,7 +22,7 @@
说明：
每个账号，除默认插值点方案外，最多可以新建3个自定义插值点方案。
其中，默认插值点方案插值点属于国家站，新建自定义插值点方案时，基于默认插值点方案中的点位，按自己需求进行插值点位的选择与调整。
- + @@ -30,34 +30,35 @@ 说明:
{{ schemeRuleForm.desc }}
- 确定 + 确定 取消 - - - 下载模版 - 上传文件 - +
+ + 下载模版 + 上传文件 +
+
提示：如果要用导入的离线数据进行等值面绘制，则需开启离线数据源开关，否则绘制不生效。
- +
- +
图例(毫米)
-
+
{{ imgIntervalLabel[index] }}
@@ -66,18 +67,18 @@
- + 地形图 矢量图 影像图
-