diff --git a/.env.development b/.env.development index dfe40e96d..0770dd87d 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,10 @@ NODE_ENV=development # VUE_APP_API_SERVER = https://epmet-preview.elinkservice.cn/api # VUE_APP_API_SERVER = http://192.168.1.60:8080/api -# # VUE_APP_API_SERVER = http://192.168.1.140/api -# VUE_APP_API_SERVER = http://219.146.91.110:30801/api -VUE_APP_API_SERVER = http://192.168.1.140/api -VUE_APP_API_LIVE = http://192.168.1.140/live/ +# VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = http://219.146.91.110:30801/api +# VUE_APP_API_SERVER = http://192.168.1.140/api +# VUE_APP_API_LIVE = http://192.168.1.140/live/ # VUE_APP_API_SERVER = http://219.146.91.110:30801/api219.146.91.110:30801 # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api diff --git a/.env.production b/.env.production index 8bd35e8c6..102be998f 100644 --- a/.env.production +++ b/.env.production @@ -3,3 +3,4 @@ VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api VUE_APP_BIPASS_API_SERVER = http://bipaas.elinkservice.cn/linkdata/linkdata-gateway/route VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper + \ No newline at end of file diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue index 221746971..ffd29de40 100644 --- a/src/components/GridTree/nodeWrap.vue +++ b/src/components/GridTree/nodeWrap.vue @@ -8,7 +8,7 @@ - +
diff --git a/src/views/dataBoard/home/cpts/djyl.vue b/src/views/dataBoard/home/cpts/djyl.vue index a54f80f1c..4de9553d3 100644 --- a/src/views/dataBoard/home/cpts/djyl.vue +++ b/src/views/dataBoard/home/cpts/djyl.vue @@ -2,10 +2,10 @@
- +
-
{{ item.tittle }}
-
{{ item.partyBranchName }}
+
{{ item.title }}
+
{{ item.agencyName }}
@@ -27,9 +27,11 @@ export default { }, methods: { async getList() { - let url = '/actual/base/partyBuildLeads/page' + let url = '/actual/base/communityPublicity/page' let parm = { - agencyId: this.$store.state.user.agencyId + agencyId: this.$store.state.user.agencyId, + pageSize: 4, + pageNo: 1, } let { code, data, msg } = await requestPost(url, parm) if (code === 0) { diff --git a/vue.config.js b/vue.config.js index 547dae129..c1631bc87 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,8 +36,7 @@ module.exports = { }, "/api": { // target: " https://epmet-test.elinkservice.cn/", - - // target: "http://219.146.91.110:30801", // 测试地址 + // target: "http://219.146.91.110:30801", // 测试地址 // target: "http://192.168.1.60:8080", // 本地地址 target: "https://epmet-dongming.elinkservice.cn", // 演示地址 changeOrigin: true, @@ -55,6 +54,13 @@ module.exports = { }, // webpack简单配置 configureWebpack: { + module: { + rules: [{ + test: /\.mjs$/, + include: /node_modules/, + type: 'javascript/auto' + }] + }, // debuge调试配置 devtool: "source-map", externals: {