From 2dc5a861a4ff15d4c5e16de9f566350191b7ead0 Mon Sep 17 00:00:00 2001 From: Bella <869686909@qq.com> Date: Sat, 23 Sep 2023 10:12:58 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E8=B7=B3=E8=BD=AC=E5=85=91=E5=A5=96=EF=BC=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=A5=96=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 127 ++---------------- .../Logical/fragment/RandomList.vue | 2 +- .../Logical/fragment/RandomListV2.vue | 32 ++++- src/views/planetDesign/redpacket/addset.vue | 32 ++++- src/views/planetDesign/redpacket/luck.vue | 76 +++++++++++ 5 files changed, 147 insertions(+), 122 deletions(-) diff --git a/package-lock.json b/package-lock.json index b7bf2cf9..878ef1f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3756,7 +3756,7 @@ "version": "1.0.3", "resolved": "https://registry.npm.taobao.org/async-each/download/async-each-1.0.3.tgz", "integrity": "sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8=", - "dev": true + "devOptional": true }, "node_modules/async-limiter": { "version": "1.0.1", @@ -4076,7 +4076,6 @@ "version": "1.5.0", "resolved": "https://registry.nlark.com/bindings/download/bindings-1.5.0.tgz?cache=0&sync_timestamp=1624608043149&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbindings%2Fdownload%2Fbindings-1.5.0.tgz", "integrity": "sha1-EDU8npRTNLwFEabZCzj7x8nFBN8=", - "dev": true, "optional": true, "dependencies": { "file-uri-to-path": "1.0.0" @@ -7928,7 +7927,6 @@ "version": "1.0.0", "resolved": "https://registry.nlark.com/file-uri-to-path/download/file-uri-to-path-1.0.0.tgz", "integrity": "sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=", - "dev": true, "optional": true }, "node_modules/filesize": { @@ -8375,7 +8373,7 @@ "version": "3.1.0", "resolved": "https://registry.npmmirror.com/glob-parent/download/glob-parent-3.1.0.tgz?cache=0&sync_timestamp=1632953810778&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, + "devOptional": true, "dependencies": { "is-glob": "^3.1.0", "path-dirname": "^1.0.0" @@ -8385,7 +8383,7 @@ "version": "3.1.0", "resolved": "https://registry.npmmirror.com/is-glob/download/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, + "devOptional": true, "dependencies": { "is-extglob": "^2.1.0" }, @@ -10823,7 +10821,6 @@ "version": "2.15.0", "resolved": "https://registry.nlark.com/nan/download/nan-2.15.0.tgz?cache=0&sync_timestamp=1628093719696&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnan%2Fdownload%2Fnan-2.15.0.tgz", "integrity": "sha1-PzSkc/8Y4VwbVia2KQO1rW5mX+4=", - "dev": true, "optional": true }, "node_modules/nanoid": { @@ -11710,7 +11707,7 @@ "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/path-dirname/download/path-dirname-1.0.2.tgz", "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", - "dev": true + "devOptional": true }, "node_modules/path-exists": { "version": "4.0.0", @@ -13921,7 +13918,7 @@ "version": "1.1.0", "resolved": "https://registry.npm.taobao.org/remove-trailing-separator/download/remove-trailing-separator-1.1.0.tgz", "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true + "devOptional": true }, "node_modules/renderkid": { "version": "2.0.7", @@ -16512,7 +16509,7 @@ "version": "1.2.0", "resolved": "https://registry.npm.taobao.org/upath/download/upath-1.2.0.tgz", "integrity": "sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ=", - "dev": true, + "devOptional": true, "engines": { "node": ">=4", "yarn": "*" @@ -17233,7 +17230,6 @@ "version": "2.0.1", "resolved": "https://registry.npm.taobao.org/watchpack-chokidar2/download/watchpack-chokidar2-2.0.1.tgz", "integrity": "sha1-OFAAcu5uzmbzdpk2lQ6hdxvhyVc=", - "dev": true, "optional": true, "dependencies": { "chokidar": "^2.1.8" @@ -17243,7 +17239,6 @@ "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/anymatch/download/anymatch-2.0.0.tgz?cache=0&sync_timestamp=1617747502795&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fanymatch%2Fdownload%2Fanymatch-2.0.0.tgz", "integrity": "sha1-vLJLTzeTTZqnrBe0ra+J58du8us=", - "dev": true, "optional": true, "dependencies": { "micromatch": "^3.1.4", @@ -17254,7 +17249,6 @@ "version": "2.1.1", "resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, "optional": true, "dependencies": { "remove-trailing-separator": "^1.0.1" @@ -17267,7 +17261,6 @@ "version": "1.13.1", "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.13.1.tgz", "integrity": "sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U=", - "dev": true, "optional": true, "engines": { "node": ">=0.10.0" @@ -17278,7 +17271,6 @@ "resolved": "https://registry.npmmirror.com/chokidar/download/chokidar-2.1.8.tgz", "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "deprecated": "Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies", - "dev": true, "optional": true, "dependencies": { "anymatch": "^2.0.0", @@ -17302,7 +17294,6 @@ "resolved": "https://registry.npmmirror.com/fsevents/download/fsevents-1.2.13.tgz", "integrity": "sha1-8yXLBFVZJCi88Rs4M3DvcOO/zDg=", "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", - "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -17320,7 +17311,6 @@ "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, "optional": true, "dependencies": { "binary-extensions": "^1.0.0" @@ -17333,7 +17323,6 @@ "version": "2.2.1", "resolved": "https://registry.npm.taobao.org/readdirp/download/readdirp-2.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freaddirp%2Fdownload%2Freaddirp-2.2.1.tgz", "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=", - "dev": true, "optional": true, "dependencies": { "graceful-fs": "^4.1.11", @@ -21277,7 +21266,7 @@ "version": "1.0.3", "resolved": "https://registry.npm.taobao.org/async-each/download/async-each-1.0.3.tgz", "integrity": "sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8=", - "dev": true + "devOptional": true }, "async-limiter": { "version": "1.0.1", @@ -21544,7 +21533,6 @@ "version": "1.5.0", "resolved": "https://registry.nlark.com/bindings/download/bindings-1.5.0.tgz?cache=0&sync_timestamp=1624608043149&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbindings%2Fdownload%2Fbindings-1.5.0.tgz", "integrity": "sha1-EDU8npRTNLwFEabZCzj7x8nFBN8=", - "dev": true, "optional": true, "requires": { "file-uri-to-path": "1.0.0" @@ -24702,7 +24690,6 @@ "version": "1.0.0", "resolved": "https://registry.nlark.com/file-uri-to-path/download/file-uri-to-path-1.0.0.tgz", "integrity": "sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=", - "dev": true, "optional": true }, "filesize": { @@ -25061,7 +25048,7 @@ "version": "3.1.0", "resolved": "https://registry.npmmirror.com/glob-parent/download/glob-parent-3.1.0.tgz?cache=0&sync_timestamp=1632953810778&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, + "devOptional": true, "requires": { "is-glob": "^3.1.0", "path-dirname": "^1.0.0" @@ -25071,7 +25058,7 @@ "version": "3.1.0", "resolved": "https://registry.npmmirror.com/is-glob/download/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, + "devOptional": true, "requires": { "is-extglob": "^2.1.0" } @@ -27044,7 +27031,6 @@ "version": "2.15.0", "resolved": "https://registry.nlark.com/nan/download/nan-2.15.0.tgz?cache=0&sync_timestamp=1628093719696&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnan%2Fdownload%2Fnan-2.15.0.tgz", "integrity": "sha1-PzSkc/8Y4VwbVia2KQO1rW5mX+4=", - "dev": true, "optional": true }, "nanoid": { @@ -27762,7 +27748,7 @@ "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/path-dirname/download/path-dirname-1.0.2.tgz", "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", - "dev": true + "devOptional": true }, "path-exists": { "version": "4.0.0", @@ -29581,7 +29567,7 @@ "version": "1.1.0", "resolved": "https://registry.npm.taobao.org/remove-trailing-separator/download/remove-trailing-separator-1.1.0.tgz", "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true + "devOptional": true }, "renderkid": { "version": "2.0.7", @@ -31655,7 +31641,7 @@ "version": "1.2.0", "resolved": "https://registry.npm.taobao.org/upath/download/upath-1.2.0.tgz", "integrity": "sha1-j2bbzVWog6za5ECK+LA1pQRMGJQ=", - "dev": true + "devOptional": true }, "upper-case": { "version": "1.1.3", @@ -31993,87 +31979,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-matomo": { "version": "4.1.0", "resolved": "https://registry.npmmirror.com/vue-matomo/-/vue-matomo-4.1.0.tgz", @@ -32294,7 +32199,6 @@ "version": "2.0.1", "resolved": "https://registry.npm.taobao.org/watchpack-chokidar2/download/watchpack-chokidar2-2.0.1.tgz", "integrity": "sha1-OFAAcu5uzmbzdpk2lQ6hdxvhyVc=", - "dev": true, "optional": true, "requires": { "chokidar": "^2.1.8" @@ -32304,7 +32208,6 @@ "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/anymatch/download/anymatch-2.0.0.tgz?cache=0&sync_timestamp=1617747502795&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fanymatch%2Fdownload%2Fanymatch-2.0.0.tgz", "integrity": "sha1-vLJLTzeTTZqnrBe0ra+J58du8us=", - "dev": true, "optional": true, "requires": { "micromatch": "^3.1.4", @@ -32315,7 +32218,6 @@ "version": "2.1.1", "resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, "optional": true, "requires": { "remove-trailing-separator": "^1.0.1" @@ -32327,14 +32229,12 @@ "version": "1.13.1", "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.13.1.tgz", "integrity": "sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U=", - "dev": true, "optional": true }, "chokidar": { "version": "2.1.8", "resolved": "https://registry.npmmirror.com/chokidar/download/chokidar-2.1.8.tgz", "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", - "dev": true, "optional": true, "requires": { "anymatch": "^2.0.0", @@ -32355,7 +32255,6 @@ "version": "1.2.13", "resolved": "https://registry.npmmirror.com/fsevents/download/fsevents-1.2.13.tgz", "integrity": "sha1-8yXLBFVZJCi88Rs4M3DvcOO/zDg=", - "dev": true, "optional": true, "requires": { "bindings": "^1.5.0", @@ -32366,7 +32265,6 @@ "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, "optional": true, "requires": { "binary-extensions": "^1.0.0" @@ -32376,7 +32274,6 @@ "version": "2.2.1", "resolved": "https://registry.npm.taobao.org/readdirp/download/readdirp-2.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freaddirp%2Fdownload%2Freaddirp-2.2.1.tgz", "integrity": "sha1-DodiKjMlqjPokihcr4tOhGUppSU=", - "dev": true, "optional": true, "requires": { "graceful-fs": "^4.1.11", diff --git a/src/views/planetDesign/Logical/fragment/RandomList.vue b/src/views/planetDesign/Logical/fragment/RandomList.vue index e80cb844..9bbfab01 100644 --- a/src/views/planetDesign/Logical/fragment/RandomList.vue +++ b/src/views/planetDesign/Logical/fragment/RandomList.vue @@ -534,4 +534,4 @@ export default { .right-10 { margin-right: 10px; } - \ No newline at end of file + diff --git a/src/views/planetDesign/Logical/fragment/RandomListV2.vue b/src/views/planetDesign/Logical/fragment/RandomListV2.vue index 256f7503..e3ea4650 100644 --- a/src/views/planetDesign/Logical/fragment/RandomListV2.vue +++ b/src/views/planetDesign/Logical/fragment/RandomListV2.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/src/views/Creative/Ring360Preview.vue b/src/views/Creative/Ring360Preview.vue index 79035838..890966ab 100644 --- a/src/views/Creative/Ring360Preview.vue +++ b/src/views/Creative/Ring360Preview.vue @@ -37,7 +37,7 @@ export default { async mounted() { regDelTinymceCreativeIframe(); - + const res = await getMaterialsById(this.$route.query.id); try{ const data = JSON.parse(res.data.materials[0].space_json); @@ -99,4 +99,4 @@ export default { top: 50%; transform: translate(-50%, -50%); } - \ No newline at end of file + diff --git a/src/views/Creative/components/PreviewerCreation/Model3DPreviewer.vue b/src/views/Creative/components/PreviewerCreation/Model3DPreviewer.vue index a8928144..ef8b97d2 100644 --- a/src/views/Creative/components/PreviewerCreation/Model3DPreviewer.vue +++ b/src/views/Creative/components/PreviewerCreation/Model3DPreviewer.vue @@ -1,10 +1,17 @@ \ No newline at end of file + diff --git a/src/views/Creative/components/PreviewerCreation/ScenePreviewer.vue b/src/views/Creative/components/PreviewerCreation/ScenePreviewer.vue index 904bb084..35d4700e 100644 --- a/src/views/Creative/components/PreviewerCreation/ScenePreviewer.vue +++ b/src/views/Creative/components/PreviewerCreation/ScenePreviewer.vue @@ -1,72 +1,100 @@ - - - - - \ No newline at end of file + + + + + diff --git a/src/views/planetDesign/Design/components/config/Viewer3D/SceneSurveyViewerPreview.vue b/src/views/planetDesign/Design/components/config/Viewer3D/SceneSurveyViewerPreview.vue index 774fa101..ec574bbe 100644 --- a/src/views/planetDesign/Design/components/config/Viewer3D/SceneSurveyViewerPreview.vue +++ b/src/views/planetDesign/Design/components/config/Viewer3D/SceneSurveyViewerPreview.vue @@ -23,12 +23,12 @@ export default { methods: { tryInitView() { if (!this.viewer_) { - + this.viewer_ = new SurveyViewer({ container: this.$el, surveyId: this.surveyId, shopData: this.shopData, - + prefixAsset: '/shelves-v5-asset', // v5, #20230104 }); this.viewer_.on("loadingCompletion", () => { @@ -48,19 +48,27 @@ export default { } return this.viewer_; }, + + snapshot() { + if (this.viewer_) { + return this.viewer_.snapshot() + } else { + return null + } + }, }, watch: { page(newVal, oldVal) { // console.log('page ........', newVal, oldVal) if (this.viewer_) { - + this.viewer_.flyAnimation = !(this.defaultWare?.planetid && this.isLocked); this.viewer_.frostFarScene = this.isLocked; - + this.viewer_.arrange(newVal).then(() => { this.$emit("onPageCompletion"); - + if(!this.defaultWare) return; // #20221018 @@ -72,7 +80,7 @@ export default { }); } }, - + page_shelves(newVal, oldVal) { console.log('page ........', newVal, oldVal) if (this.viewer_) { @@ -80,7 +88,7 @@ export default { this.$emit("onPageCompletion") if(!this.defaultWare) return; - + // #20221018 this.viewer_.hold({ wareId: this.defaultWare?.planetid, @@ -118,4 +126,4 @@ div.container-viewer-1-:focus { div.container-viewer-1- >>> canvas:focus { outline: none; } - \ No newline at end of file + From 4b6a3fcbc84086dc107479a6cb8c493daf8b0f31 Mon Sep 17 00:00:00 2001 From: Bella <869686909@qq.com> Date: Thu, 28 Sep 2023 17:38:59 +0800 Subject: [PATCH 04/17] =?UTF-8?q?3d=E4=BA=A7=E5=93=81=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=88=AA=E5=9B=BE=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/AddWareWithSeparateTextureDemo.vue | 542 +++++++++--------- .../shelves-vue/components/editor/Toolbar.vue | 219 +++---- src/views/Creative/Model3DPreview.vue | 29 +- .../PreviewerCreation/Model3DPreviewer.vue | 13 +- .../PreviewerCreation/ScenePreviewer.vue | 26 +- 5 files changed, 397 insertions(+), 432 deletions(-) diff --git a/src/views/Creative/3d/crossyo/shelves-vue-demo/view/AddWareWithSeparateTextureDemo.vue b/src/views/Creative/3d/crossyo/shelves-vue-demo/view/AddWareWithSeparateTextureDemo.vue index 9219a081..55b6bf95 100644 --- a/src/views/Creative/3d/crossyo/shelves-vue-demo/view/AddWareWithSeparateTextureDemo.vue +++ b/src/views/Creative/3d/crossyo/shelves-vue-demo/view/AddWareWithSeparateTextureDemo.vue @@ -1,271 +1,271 @@ - - - - - - - + + + + + + + diff --git a/src/views/Creative/3d/crossyo/shelves-vue/components/editor/Toolbar.vue b/src/views/Creative/3d/crossyo/shelves-vue/components/editor/Toolbar.vue index 6d360532..ff33e828 100644 --- a/src/views/Creative/3d/crossyo/shelves-vue/components/editor/Toolbar.vue +++ b/src/views/Creative/3d/crossyo/shelves-vue/components/editor/Toolbar.vue @@ -1,109 +1,110 @@ - - - - - + + + + + diff --git a/src/views/Creative/Model3DPreview.vue b/src/views/Creative/Model3DPreview.vue index 3873cf6b..9daa8449 100644 --- a/src/views/Creative/Model3DPreview.vue +++ b/src/views/Creative/Model3DPreview.vue @@ -5,9 +5,6 @@ :selTexture="selTexture" @onLoadingCompletion="onLoadingCompletion" style="width: 100%; height: 100%;" /> -
- -
\ No newline at end of file + diff --git a/src/views/DataAnalyse/composables/useCustomHeaderTitle.js b/src/views/DataAnalyse/composables/useCustomHeaderTitle.js index 71f678a2..e065fc7c 100644 --- a/src/views/DataAnalyse/composables/useCustomHeaderTitle.js +++ b/src/views/DataAnalyse/composables/useCustomHeaderTitle.js @@ -1,7 +1,7 @@ import { ref, watch } from "vue"; import CustomTableHeaderCell from '@/views/DataAnalyse/components/CustomTableHeaderCell' export default function renderCustomHeader(columns, sn ,search_params) { - + const customHeaders = ref([]) function renderCell(data, sn, search_params) { @@ -12,12 +12,25 @@ export default function renderCustomHeader(columns, sn ,search_params) { customHeaders.value = data.map(item => { return { ...item, - title: renderCell(item, sn, search_params) + title: renderCell(item, sn, search_params.value) } }) } }, { immediate: true }) - return { customHeaders } + watch(search_params, (data) => { + + if(columns) { + customHeaders.value = columns.value.map(item => { + return { + ...item, + title: renderCell(item, sn, data) + } + }) + } + }, { + deep:true + }) + return {customHeaders} } diff --git a/src/views/DataAnalyse/diagram/components/DiagramTableFile.vue b/src/views/DataAnalyse/diagram/components/DiagramTableFile.vue index 073a2dae..1a25eda8 100644 --- a/src/views/DataAnalyse/diagram/components/DiagramTableFile.vue +++ b/src/views/DataAnalyse/diagram/components/DiagramTableFile.vue @@ -84,7 +84,7 @@ export default defineComponent({ const permission = inject("permission"); const searchParams = inject("searchParams"); - + console.log('searchParams',searchParams); const tableSource = ref([]); const columns = ref([ @@ -138,7 +138,12 @@ export default defineComponent({ async function handleClick() { const sn = props.sn; const question_index = props.data.question_index; - let data ={ download_type: '3', question_index } + const tableSearchInfo = searchParams.value; + delete tableSearchInfo.type;//文件下载没有type类型,去掉 + console.log(tableSearchInfo); + + let data ={ download_type: '3', question_index,...tableSearchInfo } + addDownloadCenter(sn,data).then(res=>{ store.dispatch('downloadCenter/changeCenterUrl',route.path) store.dispatch('downloadCenter/changeCenterShow',true) diff --git a/src/views/DataAnalyse/particulars/list.vue b/src/views/DataAnalyse/particulars/list.vue index 2f2eb556..382fd1f2 100644 --- a/src/views/DataAnalyse/particulars/list.vue +++ b/src/views/DataAnalyse/particulars/list.vue @@ -10,14 +10,14 @@
- 明细数据 + 明细数据222 - + { return { ...queryState.value, page: page.value, - per_page: per_page.value + per_page: per_page.value, + ...subInfo.value } }) From 0327934bd99b836b44dd5fce25aa3d657cb8aa97 Mon Sep 17 00:00:00 2001 From: Bella <869686909@qq.com> Date: Tue, 10 Oct 2023 10:00:44 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=85=91=E5=A5=96?= =?UTF-8?q?=EF=BC=8C=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/DataAnalyse/particulars/list.vue | 2 +- src/views/planetDesign/redpacket/addset.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/DataAnalyse/particulars/list.vue b/src/views/DataAnalyse/particulars/list.vue index 382fd1f2..111cdd7c 100644 --- a/src/views/DataAnalyse/particulars/list.vue +++ b/src/views/DataAnalyse/particulars/list.vue @@ -10,7 +10,7 @@
- 明细数据222 + 明细数据 + + + + - - - 题目文本 - 题目序号 - + + + 文本 + 序号 + + + + + - - - 答案文本 - 答案代码 - + + + 文本 + 代码 + + + + + - +
(开放式文本包括填空题、文件上传题等)
- +
@@ -106,8 +119,13 @@
--> - - + + + + {{ radio.label }} + + + @@ -463,14 +481,14 @@ const selectKeys = computed(() => store.state.dataFilter.selectKeys) const isFilterData = computed(() => { const retArr = [ { - value: '0', - label: '整个数据集' + value: '1', + label: '筛选后数据' } ] if (isFilterInfo.value?.isFilterFlag) { retArr.push({ - value: '1', - label: '筛选后数据' + value: '0', + label: '整个数据集' }) } // if(selectKeys.value.length>0){ @@ -868,18 +886,46 @@ const postSurveysAnswersClone = async (id) => { // 修改格式 const changeType = (e) => { console.log(e) - if (e == 3) { - formState.column_type = null - formState.header_column_type = null - formState.include_open = false - formState.contains_base = false - } else { - formState.column_type = '0' - formState.header_column_type = '0' - formState.include_open = true - formState.contains_base = true + if (e.target.value ==2) + { + //如果选择csv格式,如果选择序号或者代码,则提示 + if (formState.column_type == 1 || formState.header_column_type == 1) + { + message.error('CSV文件由于格式限制不支持导出代码与文本对照表,如有需要请下载Excel文件!') + } + } + // if (e == 3) { + // formState.column_type = null + // formState.header_column_type = null + // formState.include_open = false + // formState.contains_base = false + // } else { + // formState.column_type = '0' + // formState.header_column_type = '0' + // formState.include_open = true + // formState.contains_base = true + // } +} + +const changeColumnType = (e) => { + //如果选择序号,则判断导出格式类型是否是csv,则提示 + if (e.target.value ==1) { + if (formState.type == 2) { + message.error('CSV文件由于格式限制不支持导出代码与文本对照表,如有需要请下载Excel文件!') + } } } +const changeHeaderColumnType = (e) => { + //如果选择代码,则判断导出格式类型是否是csv,则提示 + if (e.target.value ==1) { + if (formState.type == 2) { + message.error('CSV文件由于格式限制不支持导出代码与文本对照表,如有需要请下载Excel文件!') + } + } +} + + + watch( () => modalVis.value, async (nval) => { From b3ba237a30bc592445a4d6bca0eb9808f99b7a2b Mon Sep 17 00:00:00 2001 From: Bella <869686909@qq.com> Date: Wed, 11 Oct 2023 10:27:52 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AF=B9=E7=85=A7?= =?UTF-8?q?=E8=A1=A8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/DataAnalyse/components/diagram/newModal.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/DataAnalyse/components/diagram/newModal.vue b/src/views/DataAnalyse/components/diagram/newModal.vue index e12f739f..39617569 100644 --- a/src/views/DataAnalyse/components/diagram/newModal.vue +++ b/src/views/DataAnalyse/components/diagram/newModal.vue @@ -891,7 +891,7 @@ const changeType = (e) => { //如果选择csv格式,如果选择序号或者代码,则提示 if (formState.column_type == 1 || formState.header_column_type == 1) { - message.error('CSV文件由于格式限制不支持导出代码与文本对照表,如有需要请下载Excel文件!') + message.warning('CSV文件由于格式限制不支持导出代码与文本对照表,如有需要请下载Excel文件!') } } // if (e == 3) { @@ -911,7 +911,7 @@ const changeColumnType = (e) => { //如果选择序号,则判断导出格式类型是否是csv,则提示 if (e.target.value ==1) { if (formState.type == 2) { - message.error('CSV文件由于格式限制不支持导出代码与文本对照表,如有需要请下载Excel文件!') + message.warning('CSV文件由于格式限制不支持导出代码与文本对照表,如有需要请下载Excel文件!') } } } @@ -919,7 +919,7 @@ const changeHeaderColumnType = (e) => { //如果选择代码,则判断导出格式类型是否是csv,则提示 if (e.target.value ==1) { if (formState.type == 2) { - message.error('CSV文件由于格式限制不支持导出代码与文本对照表,如有需要请下载Excel文件!') + message.warning('CSV文件由于格式限制不支持导出代码与文本对照表,如有需要请下载Excel文件!') } } } From 95a47ee6f5e8607235d483ed695bcf252f8fb6db Mon Sep 17 00:00:00 2001 From: Bella <869686909@qq.com> Date: Wed, 11 Oct 2023 17:42:27 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/diagram/newModal.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/views/DataAnalyse/components/diagram/newModal.vue b/src/views/DataAnalyse/components/diagram/newModal.vue index 39617569..80c92712 100644 --- a/src/views/DataAnalyse/components/diagram/newModal.vue +++ b/src/views/DataAnalyse/components/diagram/newModal.vue @@ -56,8 +56,8 @@ - - + + Excel(.xlsx) CSV(.csv) @@ -79,7 +79,7 @@ - + 文本 代码 @@ -89,7 +89,7 @@ - +
(开放式文本包括填空题、文件上传题等) @@ -119,7 +119,7 @@
--> - + {{ radio.label }} @@ -512,11 +512,11 @@ const formState = reactive({ }) const rules = { type: [ - { - required: true, - message: '请选择文件格式', - trigger: 'change' - } + // { + // required: true, + // message: '请选择文件格式', + // trigger: 'change' + // } ] } // 模板下载 From 3f2e6519cc7db2b98c273625504c334ed01eb64e Mon Sep 17 00:00:00 2001 From: Bella <869686909@qq.com> Date: Thu, 12 Oct 2023 17:30:25 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/DataAnalyse/components/diagram/newModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/DataAnalyse/components/diagram/newModal.vue b/src/views/DataAnalyse/components/diagram/newModal.vue index 80c92712..779d219a 100644 --- a/src/views/DataAnalyse/components/diagram/newModal.vue +++ b/src/views/DataAnalyse/components/diagram/newModal.vue @@ -119,7 +119,7 @@
--> - + {{ radio.label }} From fddb57523ad4be10316400f5b8b17d235709ec88 Mon Sep 17 00:00:00 2001 From: Bella <869686909@qq.com> Date: Fri, 13 Oct 2023 16:13:19 +0800 Subject: [PATCH 14/17] =?UTF-8?q?spass=E5=AF=BC=E5=87=BA=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=A2=98=E7=9B=AE=E8=A1=8C=E6=96=87=E6=9C=AC=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/ico/noPen.ico | Bin 38526 -> 4286 bytes .../components/diagram/newModal.vue | 6 +++++- src/views/planetDesign/redpacket/addset.vue | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/public/ico/noPen.ico b/public/ico/noPen.ico index 8c990095484487860cd99735de0211b98cdf3204..c3a90091cab692c32b663e660caceb2f9097e25c 100644 GIT binary patch literal 4286 zcmeH~u}%U(5Qf*p(gX`*C`_QRu&}VSFu^zQReS=$%7l?Y^2yB^$PbxVfjX7}d%cV;et5PNu)%Yxs<I?iicT z&Ap*&ktq*2`-NopZHdGlKKF{vHQ>E2YSC;q&n16g>LVRnX?39i@n2X2>?x@MzO{2J zwwkkQKn)I1`%zLu8uqR<$h!Qhw_=%Q$9Y(CJ~*a{r}MkifSQbx{h(teeJ(X12Wvf< zcXxJ57>9J|pHQT1)zt}nr@_XY`_L{SLE0$@NwHPp0n(wODOiZ1>Ua#}- z^!#6*E;+eRn*q`dQJ@GGRx32863wCl1>ux}ML@G)LGx)y;Z0PHN>ssek31UFJM0TK W!xi5Y-c=~NsuC4JxQC5&B>Dks=ZZD} literal 38526 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�FrO(;LECmP4AS@Rxy|jDp>~eWJMX-!jx(M~awXu~ zF;7uhAGNa8Rln56o<%6*+16Z1DNhk}p#$x)zDK-IF?;sxq_bm(XIt6I6~%KvuES3H z>XSZ$mfok3-Vfue%~Q;qH!r?pmUsLvsI70x&ps6$%sp%aqsmjrBj-c^Rp3GJ6iC1O z$o(V6;`hbsP&{+G{;GM3I=>!~r-=AenM-Alc%LF<$9$^8j2Sap=SKQCZ?0?4Y|nzK z4kPju$j$#g#i;WX#$N4*tU#R(o!+MyWL$&ve+=luBc9i*$*^*)8Z+l%bbOWDSb%KD95U+9qX6!w8We>P~v5BX?E^AvSH8}jPP9&}j8 z7`x^vl+PU0iRfCF>yXXGCCGil@)Wrahd591+HXD@{0+_8JjDRj#cw~-zc!k(59TTS cw@DjA)D4rv@ZTie%kM - 文本 + 文本 序号 @@ -894,6 +894,10 @@ const changeType = (e) => { message.warning('CSV文件由于格式限制不支持导出代码与文本对照表,如有需要请下载Excel文件!') } } + if (e.target.value ==3) + { + formState.header_column_type = '1' + } // if (e == 3) { // formState.column_type = null // formState.header_column_type = null diff --git a/src/views/planetDesign/redpacket/addset.vue b/src/views/planetDesign/redpacket/addset.vue index 10c81f5e..d0f0cd33 100644 --- a/src/views/planetDesign/redpacket/addset.vue +++ b/src/views/planetDesign/redpacket/addset.vue @@ -1007,11 +1007,13 @@ export default defineComponent({ }); }; const changeallnumber = () => { + if (actDetailform.value.rate > 100) { message.error("概率总和不能大于100"); actDetailform.value.rate='' } }; + //获取活动详情 const actDetail = async () => { spinning.value = true; From b87cf055757930631006000fc78ca9cbd6f53921 Mon Sep 17 00:00:00 2001 From: Bella <869686909@qq.com> Date: Wed, 18 Oct 2023 10:31:32 +0800 Subject: [PATCH 15/17] =?UTF-8?q?spass=E5=AF=BC=E5=87=BA=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=A2=98=E7=9B=AE=E8=A1=8C=E6=96=87=E6=9C=AC=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/planetDesign/Logical/fragment/RandomListV2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/planetDesign/Logical/fragment/RandomListV2.vue b/src/views/planetDesign/Logical/fragment/RandomListV2.vue index e3ea4650..0084012a 100644 --- a/src/views/planetDesign/Logical/fragment/RandomListV2.vue +++ b/src/views/planetDesign/Logical/fragment/RandomListV2.vue @@ -1,7 +1,7 @@ {{props.title}} - 下载素材图 + 下载素材图