From a4e8510cea23e11c456ff8c73cddbcd800e69e2e Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Fri, 25 Aug 2023 16:15:44 +0800 Subject: [PATCH 1/2] 1 --- .env.development | 2 +- src/views/privateOrder/security/components/mock.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index 04fa558..9023ea0 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ ENV = 'development' # base api VUE_APP_BASE_API = '/dashboard' -VUE_APP_BASE_API2 = 'http://192.168.0.108:9027' +VUE_APP_BASE_API2 = 'http://39.101.188.84:9027' VUE_APP_BASE_API3 = 'http://39.101.188.84:9027' diff --git a/src/views/privateOrder/security/components/mock.js b/src/views/privateOrder/security/components/mock.js index 9d77930..dfb4854 100644 --- a/src/views/privateOrder/security/components/mock.js +++ b/src/views/privateOrder/security/components/mock.js @@ -101,10 +101,10 @@ const xitongjianceKeyValue = [ name: "IP地址", value: "ipAddress", }, - { - name: "采用端口", - value: "portName", - }, + // { + // name: "采用端口", + // value: "portName", + // }, { name: "是否关注重点", value: "isFocus", From aa9957bce9000b2356469af8646bbf5c55c7b683 Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Fri, 25 Aug 2023 16:21:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8C=BA=E5=9F=9Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../privateOrder/security/components/ReportingStatistics.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/privateOrder/security/components/ReportingStatistics.vue b/src/views/privateOrder/security/components/ReportingStatistics.vue index 06d144b..9614a38 100644 --- a/src/views/privateOrder/security/components/ReportingStatistics.vue +++ b/src/views/privateOrder/security/components/ReportingStatistics.vue @@ -138,7 +138,7 @@ import qs from "qs"; const docx = require("docx-preview"); import axios from "axios"; window.JSZip = require("jszip"); -import pdf from 'vue-pdf'; +import pdf from "vue-pdf"; import { echartsJump } from "../../../../../public/static/echartsJump"; // import { queryReportNumber, querySecurityByName } from '@/api/common' import { departmentList, territorialTB, departmentTB } from "@/api/wlSafe"; @@ -376,7 +376,7 @@ export default { territorialTB().then((res) => { res.data.forEach((value, index) => { this.piedata.push({ - name: value.locationName, + name: this.$filterDict('1',value.areaId,true), value: value.count, percent: value.pt, img: require(`@/assets/privateOrder/general/${