From 943612d894bbad00f0aefae674b084dbd617acb5 Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Mon, 23 Oct 2023 17:19:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E8=AF=A5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/commandControl/index.vue | 22 +++++++++++++++++-- .../sentiment/components/componentRight.vue | 4 ++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/views/privateOrder/sentiment/components/commandControl/index.vue b/src/views/privateOrder/sentiment/components/commandControl/index.vue index 5fa7287..5402c8c 100644 --- a/src/views/privateOrder/sentiment/components/commandControl/index.vue +++ b/src/views/privateOrder/sentiment/components/commandControl/index.vue @@ -59,7 +59,7 @@ left: 42px; z-index: 9999; " - @click="openPatrolPopup = !openPatrolPopup" + @click="openXc" >巡查内容 工作流程
@@ -266,6 +266,9 @@ export default { this.multiVideo.title = "视频监控"; this.multiVideo.show = true; + this.UAVvideoPop = false; + this.openWorkPopup = false; + this.openPatrolPopup = false; this.multiVideo.layout = "3x3"; this.multiVideo.cameraCodes = videoList.map((e) => e.CODE); }, @@ -302,6 +305,9 @@ export default { openUAVvideoPop() { const _this = this; this.UAVvideoPop = true; + this.openWorkPopup = false; + this.openPatrolPopup = false; + this.multiVideo.show = false; this.$nextTick(() => { _this.flv_load_mds(_this.$refs.refWrjVideo, _this.videoURL); }); @@ -332,6 +338,18 @@ export default { closeUAVvideoPop() { this.UAVvideoPop = false; }, + openLc() { + this.multiVideo.show = false; + this.UAVvideoPop = false; + this.openWorkPopup = true; + this.openPatrolPopup = false; + }, + openXc() { + this.multiVideo.show = false; + this.UAVvideoPop = false; + this.openWorkPopup = false; + this.openPatrolPopup = true; + }, }, }; diff --git a/src/views/privateOrder/sentiment/components/componentRight.vue b/src/views/privateOrder/sentiment/components/componentRight.vue index 5b99d95..e43ed74 100644 --- a/src/views/privateOrder/sentiment/components/componentRight.vue +++ b/src/views/privateOrder/sentiment/components/componentRight.vue @@ -534,7 +534,7 @@ export default { let str1 = str[0].split("."); this.fileExtension = str1[1]; if (this.fileExtension == "pdf") { - this.getNumPages(process.env.VUE_APP_BASE_API2 + str[0]); + this.getNumPages(str[0]); this.dialogDetails = true; } else if ( this.fileExtension === "docx" || @@ -543,7 +543,7 @@ export default { axios({ method: "get", responseType: "blob", // 设置响应文件格式 - url: process.env.VUE_APP_BASE_API2 + str[0], + url: str[0], }).then(({ data }) => { if (data) { this.dialogDetails = true; From 2f9021b123ce2064d5b7a3f51d81e11c538fbf3a Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Tue, 24 Oct 2023 15:57:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 15 +++++++++++++++ package.json | 3 +++ .../security/components/ReportingStatistics.vue | 9 ++++++--- .../security/components/componentRight.vue | 13 +++++++------ .../sentiment/components/TransferVolume.vue | 1 - .../sentiment/components/componentRight.vue | 9 ++++++--- vue.config.js | 7 +++---- 7 files changed, 40 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 413b131..87d8893 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3595,6 +3595,11 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", "dev": true }, + "@vue-office/docx": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@vue-office/docx/-/docx-1.3.0.tgz", + "integrity": "sha512-36qoKwE4VKkmGClBLg3Uxsb0ORVlFMKz2bg2TpNZlVA06Ui1fBCCyTqTywfHqWLujTAN/rGZrnFmICz9weWXgA==" + }, "@vue/babel-helper-vue-jsx-merge-props": { "version": "1.4.0", "resolved": "http://10.10.2.34:8081/repository/npm-group/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz", @@ -4163,6 +4168,11 @@ "vue-template-es2015-compiler": "^1.9.0" } }, + "@vue/composition-api": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.7.2.tgz", + "integrity": "sha512-M8jm9J/laYrYT02665HkZ5l2fWTK4dcVg3BsDHm/pfz+MjDYwX+9FUaZyGwEyXEDonQYRCo0H7aLgdklcIELjw==" + }, "@vue/preload-webpack-plugin": { "version": "1.1.2", "resolved": "http://10.10.2.34:8081/repository/npm-group/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz", @@ -18115,6 +18125,11 @@ "resolved": "http://10.10.2.34:8081/repository/npm-group/vue-cropper/-/vue-cropper-0.5.8.tgz", "integrity": "sha512-Xgi/aLQCcNCiBTUdovy/i4LWx0G7fQnAENBpDWA3J4i87Zlk9DJRksXrClsQ6nnaFRfQVkMimij5GEvAMaXdYw==" }, + "vue-demi": { + "version": "0.14.6", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz", + "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==" + }, "vue-eslint-parser": { "version": "7.11.0", "resolved": "http://10.10.2.34:8081/repository/npm-group/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz", diff --git a/package.json b/package.json index 68c22d4..fe217bf 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,8 @@ "@jiaminghi/data-view": "^2.9.6", "@riophae/vue-treeselect": "^0.4.0", "@turf/turf": "^6.5.0", + "@vue-office/docx": "^1.3.0", + "@vue/composition-api": "^1.7.2", "axios": "^0.21.4", "clipboard": "^2.0.6", "core-js": "3.6.5", @@ -46,6 +48,7 @@ "vue": "2.6.10", "vue-awesome-swiper": "^4.1.1", "vue-cropper": "^0.5.5", + "vue-demi": "^0.14.6", "vue-flip-page": "^1.0.7", "vue-loader": "^15.9.3", "vue-lottie": "^0.2.1", diff --git a/src/views/privateOrder/security/components/ReportingStatistics.vue b/src/views/privateOrder/security/components/ReportingStatistics.vue index 96bff5c..8ce58db 100644 --- a/src/views/privateOrder/security/components/ReportingStatistics.vue +++ b/src/views/privateOrder/security/components/ReportingStatistics.vue @@ -298,11 +298,14 @@ export default { }); }, rowClick(row) { + if (!row.fileName && !row.fileUrl) return; let str = row.fileUrl.split(","); let str1 = str[0].split("."); - this.fileExtension = str1[1]; + this.fileExtension = str1[str1.length - 1]; + let newarr = str[0].split("/"); + let lastArr = newarr.slice(newarr.indexOf("demo") + 1, newarr.length); if (this.fileExtension == "pdf") { - this.getNumPages(str[0]); + this.getNumPages("/demo" + "/" + lastArr.join("/")); this.dialogStatus2 = true; } else if ( this.fileExtension === "docx" || @@ -311,7 +314,7 @@ export default { axios({ method: "get", responseType: "blob", // 设置响应文件格式 - url: str[0], + url: "/demo" + "/" + lastArr.join("/") }).then(({ data }) => { if (data) { this.dialogStatus2 = true; diff --git a/src/views/privateOrder/security/components/componentRight.vue b/src/views/privateOrder/security/components/componentRight.vue index c1227a7..8f7441b 100644 --- a/src/views/privateOrder/security/components/componentRight.vue +++ b/src/views/privateOrder/security/components/componentRight.vue @@ -549,13 +549,14 @@ export default { }); return; } - console.log(e); - this.fileExtension = e.target.dataset.url.substring( - e.target.dataset.url.lastIndexOf(".") + 1 - ); + let str = e.target.dataset.url.split(","); + let str1 = str[0].split("."); + this.fileExtension = str1[str1.length - 1]; + let newarr = str[0].split("/"); + let lastArr = newarr.slice(newarr.indexOf("demo") + 1, newarr.length); if (this.fileExtension == "pdf") { // this.pdfUrl = process.env.VUE_APP_BASE_API2 + e.target.dataset.url; - this.getNumPages( e.target.dataset.url); + this.getNumPages("/demo" + "/" + lastArr.join("/")); // this.dialogDetails = true; } else if ( this.fileExtension === "docx" || @@ -564,7 +565,7 @@ export default { axios({ method: "get", responseType: "blob", // 设置响应文件格式 - url: e.target.dataset.url, + url: "/demo" + "/" + lastArr.join("/"), }) .then(({ data }) => { if (data) { diff --git a/src/views/privateOrder/sentiment/components/TransferVolume.vue b/src/views/privateOrder/sentiment/components/TransferVolume.vue index 267f0c4..5112fec 100644 --- a/src/views/privateOrder/sentiment/components/TransferVolume.vue +++ b/src/views/privateOrder/sentiment/components/TransferVolume.vue @@ -241,7 +241,6 @@ export default { if (options && typeof options === "object") { // 定时自动滚动 setInterval(() => { - console.log(options); if (options.dataZoom[0].endValue == this.lineValue?.length) { options.dataZoom[0].endValue = 4; options.dataZoom[0].startValue = 0; diff --git a/src/views/privateOrder/sentiment/components/componentRight.vue b/src/views/privateOrder/sentiment/components/componentRight.vue index e43ed74..4f50b48 100644 --- a/src/views/privateOrder/sentiment/components/componentRight.vue +++ b/src/views/privateOrder/sentiment/components/componentRight.vue @@ -529,12 +529,15 @@ export default { this.getyqbgType(); }, rowClick(row) { + console.log(row); if (!row.fileName && !row.fileUrl) return; let str = row.fileUrl.split(","); let str1 = str[0].split("."); - this.fileExtension = str1[1]; + this.fileExtension = str1[str1.length - 1]; + let newarr = str[0].split("/"); + let lastArr = newarr.slice(newarr.indexOf("demo") + 1, newarr.length); if (this.fileExtension == "pdf") { - this.getNumPages(str[0]); + this.getNumPages("/demo" + "/" + lastArr.join("/")); this.dialogDetails = true; } else if ( this.fileExtension === "docx" || @@ -543,7 +546,7 @@ export default { axios({ method: "get", responseType: "blob", // 设置响应文件格式 - url: str[0], + url: "/demo" + "/" + lastArr.join("/"), }).then(({ data }) => { if (data) { this.dialogDetails = true; diff --git a/vue.config.js b/vue.config.js index a5df024..9366719 100644 --- a/vue.config.js +++ b/vue.config.js @@ -60,12 +60,11 @@ module.exports = { ["^" + process.env.VUE_APP_BASE_API]: "", }, }, - "/fileApi": { - target: "http://39.101.188.84:9027", // 这是本地地址 http://47.116.52.164:10002/sitefiles/wxb/ - ws: false, + "/demo": { + target: "http://39.101.188.84:9999/demo", // 这是本地地址 http://47.116.52.164:10002/sitefiles/wxb/ changeOrigin: true, pathRewrite: { - ["^" + "/fileApi"]: "", + "/demo": "", }, }, },