fix: 新环境添加以及数据校验同步报告列表数据更新BUG修改

This commit is contained in:
kun 2024-06-28 18:44:24 +08:00
parent 402b86cfc8
commit dddf5d9c9a
4 changed files with 35 additions and 32 deletions

View File

@ -20,6 +20,7 @@ var COMPANY = ""; //通用
// COMPANY = 'shjg'//上海优益(上海建工) // COMPANY = 'shjg'//上海优益(上海建工)
COMPANY = "agjt"; //鞍钢集团 COMPANY = "agjt"; //鞍钢集团
// COMPANY = 'zkax' //中科安信 // COMPANY = 'zkax' //中科安信
// COMPANY = 'hfqc' //乌丹站舍(合肥启程)
var PROJECT = { var PROJECT = {
local_test: "common", // 普通版 local_test: "common", // 普通版
@ -53,6 +54,8 @@ if (COMPANY == "longguang") {
mqttUrl = "ws://zhgdmqtt.loganwy.com:80/mqtt"; mqttUrl = "ws://zhgdmqtt.loganwy.com:80/mqtt";
} else if (COMPANY == "henan") { } else if (COMPANY == "henan") {
mqttUrl = "ws://182.90.224.147:8083/mqtt"; mqttUrl = "ws://182.90.224.147:8083/mqtt";
} else if (COMPANY == "hfqc") {
mqttUrl = "ws://192.168.100.4:8083/mqtt";
} }
var enabledProjectV2 = 2; //是否用精益建造版 1精益建造版(黑色) 2 最初版(白色) 3数据看板UI蓝色版白色 4:湛蓝色 var enabledProjectV2 = 2; //是否用精益建造版 1精益建造版(黑色) 2 最初版(白色) 3数据看板UI蓝色版白色 4:湛蓝色
var CONSTRUCTIONSTAGE = [{ var CONSTRUCTIONSTAGE = [{

View File

@ -172,8 +172,8 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) // 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:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // 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://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈

View File

@ -52,18 +52,18 @@ export default new Vuex.Store({
// FILEURL:'http://182.90.224.237:51234/image/', // FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试 // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试
// FILEURL: 'http://42.180.188.17:11211/image/', //测试 // FILEURL: 'http://42.180.188.17:11211/image/', //测试
// BASEURL: baseUrl ? BASEURL: baseUrl ?
// baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址 // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址

View File

@ -77,11 +77,7 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<!-- :reserve-selection="true" --> <!-- :reserve-selection="true" -->
<el-table-column <el-table-column align="center" type="selection" width="55">
align="center"
type="selection"
width="55"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@ -212,7 +208,7 @@ export default {
multipleSelection: [], multipleSelection: [],
topicName: "topic", topicName: "topic",
userId: "", userId: "",
isInitTable: false isInitTable: false,
}; };
}, },
created() { created() {
@ -330,28 +326,32 @@ export default {
// //
getHikvisionPage() { getHikvisionPage() {
this.loading = true; this.loading = true;
console.log(1111111111, this.activeName)
getHikvisionPageApi({ getHikvisionPageApi({
projectSn: this.projectSn, projectSn: this.projectSn,
pageNo: this.pagInfo.pageNo, pageNo: this.pagInfo.pageNo,
pageSize: this.pagInfo.pageSize, pageSize: this.pagInfo.pageSize,
type: Number(this.activeName), type: Number(this.activeName),
}).then((res) => { })
.then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.tableList = res.result.records; this.tableList = res.result.records;
this.pagInfo.total = res.result.total; this.pagInfo.total = res.result.total;
if ( if (
+res.result.total > this.pageSizeList[this.pageSizeList.length - 1] && this.pageSizeList.length == 4 +res.result.total >
this.pageSizeList[this.pageSizeList.length - 1] &&
this.pageSizeList.length == 4
) { ) {
this.pageSizeList.push(+res.result.total); this.pageSizeList.push(+res.result.total);
} else { } else {
this.pageSizeList.splice(4,1,+res.result.total); this.pageSizeList.splice(4, 1, +res.result.total);
if(this.pagInfo.pageSize> +res.result.total){ if (this.pagInfo.pageSize > +res.result.total) {
this.pagInfo.pageSize = +res.result.total; this.pagInfo.pageSize = +res.result.total;
} }
} }
this.$forceUpdate();
} }
}).finally(() => { })
.finally(() => {
this.loading = false; this.loading = false;
}); });
}, },