From 9f00cae69b39319334154aec372ba276b090f02c Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Thu, 27 Jun 2024 20:46:08 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E6=8F=90=E4=BA=A4=E6=95=88?=
=?UTF-8?q?=E9=AA=8C=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/js/http.js | 32 +++++++++----------
.../laborManage/dataValidation.vue | 12 +++++--
2 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index be21d583..7e721925 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -172,23 +172,23 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
- axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
+ // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
- // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
- // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
- // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
- // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
- // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
- // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
- // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
- // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
- // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
- // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
- // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
- // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
- // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
- // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
- // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
+ axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
+ // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
+ // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
+ // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
+ // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
+ // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
+ // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
+ // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
+ // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
+ // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
+ // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
+ // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
+ // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
+ // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
+ // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
} else if (process.env.NODE_ENV == "debug") {
axios.defaults.baseURL = "https://www.ceshi.com";
} else if (process.env.NODE_ENV == "production") {
diff --git a/src/views/projectFront/laborManage/dataValidation.vue b/src/views/projectFront/laborManage/dataValidation.vue
index 17168006..b4cb2dd6 100644
--- a/src/views/projectFront/laborManage/dataValidation.vue
+++ b/src/views/projectFront/laborManage/dataValidation.vue
@@ -68,6 +68,7 @@
+
{
- console.log(message);
+ // console.log(message);
this.getHikvisionPage();
});
// 断开发起重连
@@ -275,7 +277,7 @@ export default {
return;
}
- console.log(this.multipleSelection);
+ // console.log(this.multipleSelection);
const ids = this.multipleSelection.map((item) => item.id).join(",");
this.onHikvisionSync(ids);
},
@@ -315,7 +317,7 @@ export default {
projectSn: this.projectSn,
type: Number(this.activeName),
}).then((res) => {
- console.log(res);
+ // console.log(res);
if (res.code == 200) {
this.getHikvisionPage();
} else {
@@ -325,6 +327,8 @@ export default {
},
//获取信息
getHikvisionPage() {
+ this.loading = true;
+ console.log(1111111111, this.activeName)
getHikvisionPageApi({
projectSn: this.projectSn,
pageNo: this.pagInfo.pageNo,
@@ -340,6 +344,8 @@ export default {
this.pageSizeList.push(+res.result.total);
}
}
+ }).finally(() => {
+ this.loading = false;
});
},