weizong song 5 years ago
parent 9ee982fc1f
commit a8a3e4aaa7

@ -332,8 +332,8 @@ class OrdersController extends CommonController
->select("area.id", "area.name", "area.building_id") ->select("area.id", "area.name", "area.building_id")
->leftJoin("building", "building.id", "=", "area.building_id") ->leftJoin("building", "building.id", "=", "area.building_id")
->addSelect("building.name as building_name") ->addSelect("building.name as building_name")
->orderBy("building.myindex")
->orderBy("area.myindex") ->orderBy("area.myindex")
->orderBy("area.name")
->get(); ->get();
return response()->json($areas->toArray()); return response()->json($areas->toArray());
} }

@ -250,7 +250,7 @@
</div> </div>
</div> </div>
<script src="skin/default/js/an-skill-bar.js"></script> <script src="skin/default/js/an-skill-bar.js"></script>
<script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=VGIBZ-YUMLK-LTKJN-ASK67-6ZCP3-Q5BRF"></script> <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&libraries=visualization&key=VGIBZ-YUMLK-LTKJN-ASK67-6ZCP3-Q5BRF"></script>
<script> <script>
var current_hospital = 0; var current_hospital = 0;
var map, marker; var map, marker;
@ -303,7 +303,7 @@
rotation: 20,//设置地图旋转角度 rotation: 20,//设置地图旋转角度
pitch: 45, //设置俯仰角度0~45 pitch: 45, //设置俯仰角度0~45
zoom: 17,//设置地图缩放级别 zoom: 17,//设置地图缩放级别
center: center//设置地图中心点坐标 center: center, //设置地图中心点坐标
}); });
//初始化marker //初始化marker
marker = new TMap.MultiMarker({ marker = new TMap.MultiMarker({
@ -327,7 +327,7 @@
}] }]
}); });
window.setInterval(function () { window.setInterval(function () {
panToHospital(); //panToHospital();
}, 3000); }, 3000);
} }

Loading…
Cancel
Save