zhaojing 3 лет назад
Родитель
Сommit
d0207e5b23

+ 3 - 0
public/config.js

@@ -0,0 +1,3 @@
+
+
+  var  projectId='Pj1101020002'

+ 0 - 5
public/config2.js

@@ -1,5 +0,0 @@
-
-var data = {
-    projectId:'Pj1101020002'
-}
-module.exports = data;

+ 1 - 0
public/index.html

@@ -5,6 +5,7 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta name="viewport" content="width=device-width,initial-scale=1.0" />
         <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+        <script src="./config.js"></script>
         <title><%= htmlWebpackPlugin.options.title %></title>
     </head>
     <body>

+ 3 - 2
src/store/index.ts

@@ -2,10 +2,11 @@ import Vue from "vue";
 import Vuex from "vuex";
 import axios from "@/utils/axios";
 import api from "@/api/index";
-const { projectId } = require("/public/config2.js");
 
 Vue.use(Vuex);
 
+let projectId:any=(<any>window).projectId;
+
 export default new Vuex.Store({
     state: {
         realTimeData: [], //实时数据
@@ -48,7 +49,7 @@ export default new Vuex.Store({
     },
     actions: {
         getRealTimeData({ state, commit }, data) {
-            console.log("projectId", projectId);
+            console.log("projectId",projectId);
             //实时数据
             axios
                 .get(api.queryEnvCurrent + `?projectId=${projectId}`)

+ 2 - 1
src/views/valueDelivery/FloorSpace.vue

@@ -66,7 +66,7 @@
 import { Loading } from "element-ui";
 import moment from "moment";
 import { selectColor } from "@/utils/publicMethod";
-const { projectId } = require("/public/config2.js");
+
 
 export default {
     name: "FloorSpace",
@@ -180,6 +180,7 @@ export default {
         },
         queryFs() {
             // var loading = this.$loading({ fullscreen: true });
+            console.log('projectId',projectId);
             this.$axios
                 .post(this.$api.queryFs, {
                     criteria: {

+ 0 - 1
src/views/valueDelivery/HorFloorSpace.vue

@@ -47,7 +47,6 @@
 <script>
 import moment from "moment";
 import { selectColor } from "@/utils/publicMethod";
-const { projectId } = require("/public/config2.js");
 
 export default {
     name: 'FloorSpace',

+ 1 - 1
src/views/valueDelivery/lastEnergyChart.vue

@@ -19,7 +19,7 @@ import G2 from "@antv/g2";
 import DataSet from "@antv/data-set";
 import moment from "moment";
 import { mapGetters } from "vuex";
-const { projectId } = require("/public/config2.js");
+
 
 // 自定义 shape, 支持图片形式的气泡
 G2.Shape.registerShape("interval", "borderRadius", {

+ 1 - 2
vue.config.js

@@ -1,10 +1,9 @@
 const { name } = require("./package.json");
-const { projectId } = require("./public/config2.js");
 
 let env = process.env.NODE_ENV.toString();
 console.log('env2', env);
 console.log('env2--name', name);
-console.log('env2---projectId', projectId);
+
 module.exports = {
     publicPath: '/sgshow', //相对路径
     outputDir: 'sgshow', //打包名称