diff --git a/.env.development b/.env.development index ea2d4b8..9023ea0 100644 --- a/.env.development +++ b/.env.development @@ -6,4 +6,6 @@ VUE_APP_BASE_API = '/dashboard' VUE_APP_BASE_API2 = 'http://39.101.188.84:9027' +VUE_APP_BASE_API3 = 'http://39.101.188.84:9027' + BASE_API = 'http://10.10.3.35:9070' 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/${ 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",