diff --git a/sgzb-ui/src/utils/globalUrl.js b/sgzb-ui/src/utils/globalUrl.js index c5a6e866..db167cf3 100644 --- a/sgzb-ui/src/utils/globalUrl.js +++ b/sgzb-ui/src/utils/globalUrl.js @@ -1,7 +1,7 @@ -const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试 +// const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试 // const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆 -// const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏 +const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏 // const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网 diff --git a/sgzb-ui/src/views/dashboard.vue b/sgzb-ui/src/views/dashboard.vue index 4f6f40d3..007d10cb 100644 --- a/sgzb-ui/src/views/dashboard.vue +++ b/sgzb-ui/src/views/dashboard.vue @@ -16,7 +16,7 @@ }, methods: { openNewWindow() { - window.open('http://112.29.103.165:21626/index01.html?token='+localStorage.getItem('token'), '_blank'); + window.open('http://112.29.103.165:21624/index01.html?token='+localStorage.getItem('token'), '_blank'); } } }; diff --git a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue index bf3ebdd1..3ca9bdd0 100644 --- a/sgzb-ui/src/views/stquery/deviceStatusRecord.vue +++ b/sgzb-ui/src/views/stquery/deviceStatusRecord.vue @@ -83,6 +83,7 @@ size="mini" @click="handleExport" >导出 + 保有量=在库+在用+在修+修试后待入库