From fcc3b34de6c3409feca861ecc27134362217c9ea Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Mon, 22 Nov 2021 13:42:49 +0800 Subject: [PATCH 1/2] init --- vue.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vue.config.js b/vue.config.js index db6248b..b514bbc 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,9 +3,9 @@ * https://cli.vuejs.org/zh/config/ */ // const url = 'http://pigx-gateway' -const url = 'http://39.97.167.65:9999' //测试 +// const url = 'http://39.97.167.65:9999' //测试 // const url = 'http://192.168.31.169:9999' //长龙 -// const url = 'http://192.168.31.134:9999' //嘉豪 +const url = 'http://192.168.31.134:9999' //嘉豪 // const url = 'http://192.168.31.100:9999' //王笑 // const url = 'http://nitu5e.natappfree.cc' //王笑 From e82882ce63c7fde01d37a53d6445c24c2881cee9 Mon Sep 17 00:00:00 2001 From: lancer <1905818361@qq.com> Date: Mon, 22 Nov 2021 14:33:11 +0800 Subject: [PATCH 2/2] init --- src/page/index/top/index.vue | 1 - src/views/Equipment/index.vue | 1 + src/views/Equipment/state.vue | 1 + src/views/File/index.vue | 3 ++- src/views/Statistics/index.vue | 7 ++++--- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index 7bf8a49..8629e27 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -308,7 +308,6 @@ export default { .zkorg({ current: 1, size: 10, - name: this.companyName, orgType: localStorage.getItem("orgType"), }) .then((res) => { diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue index e6bab4c..d974051 100644 --- a/src/views/Equipment/index.vue +++ b/src/views/Equipment/index.vue @@ -981,6 +981,7 @@ export default { .equipmentManagement({ size: this.size, current: this.currentPage, + timeType:1, orgType: localStorage.getItem("orgType"), orgCode: localStorage.getItem("orgCode"), agentId: localStorage.getItem("agentId"), diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue index 10e700d..e42ec8c 100644 --- a/src/views/Equipment/state.vue +++ b/src/views/Equipment/state.vue @@ -785,6 +785,7 @@ export default { .equipmentZxOnFindByPage({ size: this.size, current: this.currentPage, + timeType:2, orgType: localStorage.getItem("orgType"), orgCode: localStorage.getItem("orgCode"), agentId: localStorage.getItem("agentId"), diff --git a/src/views/File/index.vue b/src/views/File/index.vue index 8bf47fc..eada662 100644 --- a/src/views/File/index.vue +++ b/src/views/File/index.vue @@ -152,7 +152,8 @@ export default { this.$api.http.filefindByPage({ username:this.username, imei:this.imei, - sourceCode:Number(this.sourceCode), + // sourceCode:Number(this.sourceCode), + sourceCode:this.sourceCode/1||null, size:this.size, current:this.current }).then((res) => { diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue index a284f7c..4e2c437 100644 --- a/src/views/Statistics/index.vue +++ b/src/views/Statistics/index.vue @@ -1,5 +1,5 @@