diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 5fddb63..152b722 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -78,7 +78,7 @@ file:
# 安全
security:
oauth2:
- oauth-server: http://127.0.0.1:7001/usercenter
+ oauth-server: http://192.168.0.103:7001/usercenter
oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
client:
client-id: 44a8dc867f7f4465b7ba6065d87e30d7
@@ -129,4 +129,6 @@ access-control:
logging:
level:
root: error
- com.cm: debug
\ No newline at end of file
+ com.cm: debug
+
+notice-url: http://192.168.0.103:7001/usercenter
\ No newline at end of file
diff --git a/src/main/resources/static/route/enterprise/get-enterprise-location.html b/src/main/resources/static/route/enterprise/get-enterprise-location.html
new file mode 100644
index 0000000..39bf13d
--- /dev/null
+++ b/src/main/resources/static/route/enterprise/get-enterprise-location.html
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/static/route/enterprise/list-enterprise.html b/src/main/resources/static/route/enterprise/list-enterprise.html
index 3fcf836..4584a59 100644
--- a/src/main/resources/static/route/enterprise/list-enterprise.html
+++ b/src/main/resources/static/route/enterprise/list-enterprise.html
@@ -281,6 +281,11 @@
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
+ var lng = row.enterpriseLng;
+ var lat = row.enterpriseLat;
+ if(lng && lat) {
+ return ' '+ rowData +'';
+ }
return rowData;
}
},
@@ -493,6 +498,17 @@
height: '80%',
onClose: function() {}
});
+ } else if(event === 'locationEvent') {
+ var positions = this.dataset;
+ var lng = positions.lng;
+ var lat = positions.lat;
+ top.dialog.open({
+ url: top.restAjax.path('route/enterprise/get-enterprise-location.html?enterpriseId={enterpriseId}&lng={lng}&lat={lat}', [data.enterpriseId, lng, lat]),
+ title: '【'+ data.name +'】的位置',
+ width: '600px',
+ height: '500px',
+ onClose: function() {}
+ });
}
});
// 联动事件
diff --git a/src/main/resources/static/route/enterprise/v2/list-enterprise.html b/src/main/resources/static/route/enterprise/v2/list-enterprise.html
index eef27c7..e87655e 100644
--- a/src/main/resources/static/route/enterprise/v2/list-enterprise.html
+++ b/src/main/resources/static/route/enterprise/v2/list-enterprise.html
@@ -281,6 +281,11 @@
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
+ var lng = row.enterpriseLng;
+ var lat = row.enterpriseLat;
+ if(lng && lat) {
+ return ' '+ rowData +'';
+ }
return rowData;
}
},
@@ -509,6 +514,17 @@
height: '80%',
onClose: function() {}
});
+ } else if(event === 'locationEvent') {
+ var positions = this.dataset;
+ var lng = positions.lng;
+ var lat = positions.lat;
+ top.dialog.open({
+ url: top.restAjax.path('route/enterprise/get-enterprise-location.html?enterpriseId={enterpriseId}&lng={lng}&lat={lat}', [data.enterpriseId, lng, lat]),
+ title: '【'+ data.name +'】的位置',
+ width: '600px',
+ height: '500px',
+ onClose: function() {}
+ });
}
});
// 联动事件