Commit b13d50ae authored by 赵啸非's avatar 赵啸非

修改so加载路径

parent a190137a
...@@ -14,10 +14,13 @@ export default { ...@@ -14,10 +14,13 @@ export default {
console.log("token",token) console.log("token",token)
console.log("siteid",siteid) console.log("siteid",siteid)
if (token) { if (token) {
console.log(111)
window.sessionStorage.setItem("token", token); window.sessionStorage.setItem("token", token);
window.sessionStorage.setItem("siteid", siteid); window.sessionStorage.setItem("siteid", siteid);
this.$router.push("/index"); // 有token直接跳转首页 this.$router.push("/index"); // 有token直接跳转首页
} else { } else {
console.log(222)
this.$message({ this.$message({
message: "没有权限,正在跳转登录页面...", message: "没有权限,正在跳转登录页面...",
center: true, center: true,
......
...@@ -17,7 +17,7 @@ module.exports = { ...@@ -17,7 +17,7 @@ module.exports = {
hot: true,//自动保存 hot: true,//自动保存
proxy: { proxy: {
'/attendance': { '/attendance': {
target: 'http://192.168.0.98:11039', target: 'http://192.168.0.124:17',
// target: 'http://112.19.80.237:11039', // target: 'http://112.19.80.237:11039',
// target: 'http://localhost:17500', // target: 'http://localhost:17500',
changeOrigin: true, changeOrigin: true,
......
...@@ -78,11 +78,13 @@ public class HikDoorServiceImpl extends AbstractHikService implements IHikDoorSe ...@@ -78,11 +78,13 @@ public class HikDoorServiceImpl extends AbstractHikService implements IHikDoorSe
struAcsEventCond.read(); struAcsEventCond.read();
struAcsEventCond.dwSize = struAcsEventCond.size(); struAcsEventCond.dwSize = struAcsEventCond.size();
//查询全部主次类型的报警 //查询全部主次类型的报警
struAcsEventCond.dwMajor = 0; // 主次事件类型设为0,代表查询所有事件 struAcsEventCond.dwMajor = 5; // 主次事件类型设为0,代表查询所有事件
struAcsEventCond.dwMinor = 0; // struAcsEventCond.dwMinor = 0; //
Date startTime = hikDoorEventReq.getStartTime();
log.info("searchDoorEventsList req==>{}", JSON.toJSONString(hikDoorEventReq));
Date startTime = hikDoorEventReq.getStartTime();
Date endTime = hikDoorEventReq.getEndTime(); Date endTime = hikDoorEventReq.getEndTime();
//开始时间 //开始时间
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"baseUrl": "http://127.0.0.1:17500/attendance" "baseUrl": "http://127.0.0.1:17500/attendance"
}, },
"test": { "test": {
"baseUrl": "http://192.168.0.98:11039/attendance", "baseUrl": "http://192.168.0.124:17214/attendance",
"baseLogin": "http://192.168.0.98:11078/base" "baseLogin": "http://192.168.0.98:11078/base"
}, },
"yibin": { "yibin": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment