|
@@ -1,6 +1,7 @@
|
|
|
var configFile = "configure.js";
|
|
|
let prjCode = "HN01";
|
|
|
let typeStr="";
|
|
|
+let sendposition=null;
|
|
|
require({}, [configFile], (AppX) => {
|
|
|
|
|
|
loadApp(AppX);
|
|
@@ -29,6 +30,24 @@ function loadApp(AppX: AppX) {
|
|
|
return;
|
|
|
}
|
|
|
setCurrentUser(qbstoken, userId, loginUser);
|
|
|
+ }else if(typeStr==="ZHGD"){
|
|
|
+ prjCode = getSearchString('prjcode', search);
|
|
|
+ const qbstoken = getSearchString('token', search);
|
|
|
+ const userId = getSearchString('userId', search);
|
|
|
+ const loginUser = getSearchString('loginUser', search);
|
|
|
+ const longitude=getSearchString('longitude', search);
|
|
|
+ const latitude=getSearchString('latitude', search);
|
|
|
+ const height=getSearchString('height', search);
|
|
|
+ sendposition={
|
|
|
+ lon:longitude,
|
|
|
+ lat:latitude,
|
|
|
+ height:height
|
|
|
+ }
|
|
|
+ if (!prjCode || !loginUser) {
|
|
|
+ alert("登录口令缺失");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ setCurrentUser(qbstoken, userId, loginUser);
|
|
|
}
|
|
|
} else {
|
|
|
alert("登录口令缺失");
|
|
@@ -223,11 +242,19 @@ function setPrj(prj) {
|
|
|
success: function (result) {
|
|
|
if (result.code == 1 && result.result) {
|
|
|
AppX.appConfig.currentPrj = id.toString();
|
|
|
- const initPosition=JSON.parse(position);
|
|
|
- const carto=Cesium.Cartographic.fromDegrees(parseFloat(initPosition.lon),parseFloat(initPosition.lat),parseFloat(initPosition.height));
|
|
|
- const cartes3=Cesium.Cartographic.toCartesian(carto);
|
|
|
-
|
|
|
- AppX.appConfig.initPosition={position:{x:cartes3.x,y:cartes3.y,z:cartes3.z}};
|
|
|
+ if(sendposition){
|
|
|
+ const carto=Cesium.Cartographic.fromDegrees(parseFloat(sendposition.lon),parseFloat(sendposition.lat),parseFloat(sendposition.height));
|
|
|
+ const cartes3=Cesium.Cartographic.toCartesian(carto);
|
|
|
+
|
|
|
+ AppX.appConfig.initPosition={position:{x:cartes3.x,y:cartes3.y,z:cartes3.z}};
|
|
|
+ }else{
|
|
|
+ const initPosition=JSON.parse(position);
|
|
|
+ const carto=Cesium.Cartographic.fromDegrees(parseFloat(initPosition.lon),parseFloat(initPosition.lat),parseFloat(initPosition.height));
|
|
|
+ const cartes3=Cesium.Cartographic.toCartesian(carto);
|
|
|
+
|
|
|
+ AppX.appConfig.initPosition={position:{x:cartes3.x,y:cartes3.y,z:cartes3.z}};
|
|
|
+ }
|
|
|
+
|
|
|
setCurrentSystem();
|
|
|
} else {
|
|
|
console.log("set project faile");
|
|
@@ -239,8 +266,21 @@ function setPrj(prj) {
|
|
|
})
|
|
|
}
|
|
|
function setCurrentUser(token, userId, loginUser) {
|
|
|
+ let url="";
|
|
|
+ switch(typeStr){
|
|
|
+ case "QBS":
|
|
|
+ url=AppX.appConfig.apiRoot + "/auth/token/third/loginByQuality";
|
|
|
+ break;
|
|
|
+ case "ZHGD":
|
|
|
+ url=AppX.appConfig.apiRoot + "/auth/token/third/loginByEpc";
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ if(url===""){
|
|
|
+ console.log('登录验证失败');
|
|
|
+ return;
|
|
|
+ }
|
|
|
$.ajax({
|
|
|
- url: AppX.appConfig.apiRoot + "/auth/token/third/loginByQuality",
|
|
|
+ url: url,
|
|
|
type: "GET",
|
|
|
dataType: "json",
|
|
|
data: {
|