suzhou-jichuang-lanhai
/
tcZz-big
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'duhanyu' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/tcZz-big

Browse Source
duhanyu
吕天方 1 year ago
parent e145621f0e 2f9021b123
commit 13b188ee14
8 changed files with 61 additions and 20 deletions
Show Stats Download Patch File Download Diff File

15
package-lock.json generated
Unescape View File

@ -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",

3
package.json
Unescape View File

@ -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",

9
src/views/privateOrder/security/components/ReportingStatistics.vue
Unescape View File

@ -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;

13
src/views/privateOrder/security/components/componentRight.vue
Unescape View File

@ -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) {

3
src/views/privateOrder/sentiment/components/TransferVolume.vue
Unescape View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-22 10:12:56
* @LastEditTime: 2023-10-24 10:07:16
* @LastEditTime: 2023-10-24 16:06:12
* @LastEditors: JC9527
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tcingiocpro\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;

22
src/views/privateOrder/sentiment/components/commandControl/index.vue
Unescape View File

@ -59,7 +59,7 @@
left: 42px;
z-index: 9999;
"
@click="openPatrolPopup = !openPatrolPopup"
@click="openXc"
>巡查内容</el-button
>
<el-button
@ -71,7 +71,7 @@
left: 42px;
z-index: 9999;
"
@click="openWorkPopup = !openWorkPopup"
@click="openLc"
>工作流程</el-button
>
<div v-if="UAVvideoPop" class="popup-video">
@ -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;
},
},
};
</script>

9
src/views/privateOrder/sentiment/components/componentRight.vue
Unescape View File

@ -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(process.env.VUE_APP_BASE_API2 + 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: process.env.VUE_APP_BASE_API2 + str[0],
url: "/demo" + "/" + lastArr.join("/"),
}).then(({ data }) => {
if (data) {
this.dialogDetails = true;

7
vue.config.js
Unescape View File

@ -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": "",
},
},
},

Write Preview
Loading…
Cancel
Save