Commit d34f12d0 authored by 杨鑫's avatar 杨鑫

视频通话由弹窗改为新标签页(因为视频通话必须https,并且弹窗不支持打开麦克风和摄像头)

parent b37c8488
...@@ -7,7 +7,7 @@ var map = { ...@@ -7,7 +7,7 @@ var map = {
level: 'province' level: 'province'
}; };
var district = new AMap.DistrictSearch(options); var district = new AMap.DistrictSearch(options);
district.search('杭州市', function(status, result) { district.search('杭州市', function(status, result) {
var bounds = result.districtList[0]['boundaries']; var bounds = result.districtList[0]['boundaries'];
var mask = []; var mask = [];
for(var i =0;i<bounds.length;i++){ for(var i =0;i<bounds.length;i++){
...@@ -168,7 +168,7 @@ var map = { ...@@ -168,7 +168,7 @@ var map = {
}, },
getDetail: function(SceneTaskID){ getDetail: function(SceneTaskID){
$.ajax({ $.ajax({
url: 'http://detect.cnjsjd.net/AppModules/CommonFiles/Scene/XCJC_Detail.aspx?id='+SceneTaskID, url: '/AppModules/CommonFiles/Scene/XCJC_Detail.aspx?id='+SceneTaskID,
type: "get", type: "get",
success: function(data) { success: function(data) {
map.setDetail(data); map.setDetail(data);
...@@ -180,7 +180,7 @@ var map = { ...@@ -180,7 +180,7 @@ var map = {
}, },
setDetail: function(data){ setDetail: function(data){
// layer.open({ // layer.open({
// type: 1, // type: 1,
// shadeClose: true, // shadeClose: true,
// maxmin: true, // maxmin: true,
// title: "<p class='popup-title'>工程检测情况</p>", // title: "<p class='popup-title'>工程检测情况</p>",
...@@ -270,7 +270,7 @@ var getLeftData = { ...@@ -270,7 +270,7 @@ var getLeftData = {
}, },
// 视频通话 // 视频通话
videoConnection(target_op_code){ videoConnection(target_op_code){
showPopup('http://detect.cnjsjd.net/VideoConnection.aspx?target_op_code='+target_op_code, '视频通话'); window.open('https://detect.cnjsjd.net/VideoConnection.aspx?target_op_code=' + target_op_code);
} }
} }
...@@ -444,7 +444,7 @@ var getBottomData = { ...@@ -444,7 +444,7 @@ var getBottomData = {
}, },
axisTick: { axisTick: {
show: false show: false
}, },
}, },
yAxis: { yAxis: {
type: 'value', type: 'value',
...@@ -504,7 +504,7 @@ var getBottomData = { ...@@ -504,7 +504,7 @@ var getBottomData = {
}, },
} }
]}; ]};
if(type == 1){ if(type == 1){
data.data.day_info.forEach(item => { data.data.day_info.forEach(item => {
option.xAxis.data.push(item.day); option.xAxis.data.push(item.day);
...@@ -520,7 +520,7 @@ var getBottomData = { ...@@ -520,7 +520,7 @@ var getBottomData = {
} }
myChart.setOption(option); myChart.setOption(option);
$(function(){ $(function(){
window.onresize = function () { window.onresize = function () {
myChart.resize(); myChart.resize();
} }
......
...@@ -76,7 +76,7 @@ var map = { ...@@ -76,7 +76,7 @@ var map = {
<div class='icon_font icon-icon_ys-01'></div> <div class='icon_font icon-icon_ys-01'></div>
<div class='icon_font icon-icon_zx-01'></div> <div class='icon_font icon-icon_zx-01'></div>
<div class='icon_font icon-icon_yx-01'></div> <div class='icon_font icon-icon_yx-01'></div>
<div class='top-item'> <div class='top-item'>
<p class='title'>${data.data[i].project_name}</p> <p class='title'>${data.data[i].project_name}</p>
<p class='btn' onclick="getBottomData.showPopup('${data.data[i].project_id}','${item.SceneTask_id}','${item.customer_id}','${item.task_id}','${item.order_id}')">异常录入</p> <p class='btn' onclick="getBottomData.showPopup('${data.data[i].project_id}','${item.SceneTask_id}','${item.customer_id}','${item.task_id}','${item.order_id}')">异常录入</p>
...@@ -290,7 +290,7 @@ var map = { ...@@ -290,7 +290,7 @@ var map = {
}, },
// 视频通话 // 视频通话
videoConnection(op_code) { videoConnection(op_code) {
showPopup('http://detect.cnjsjd.net/VideoConnection.aspx?target_op_code=' + op_code, '视频通话'); window.open('https://detect.cnjsjd.net/VideoConnection.aspx?target_op_code=' + op_code);
} }
} }
...@@ -493,7 +493,7 @@ var getRightdata = { ...@@ -493,7 +493,7 @@ var getRightdata = {
}, },
get_XCJC_Detail: function (SceneTaskID) { get_XCJC_Detail: function (SceneTaskID) {
$.ajax({ $.ajax({
url: 'http://detect.cnjsjd.net/AppModules/CommonFiles/Scene/XCJC_Detail.aspx?id=' + SceneTaskID, url: '/AppModules/CommonFiles/Scene/XCJC_Detail.aspx?id=' + SceneTaskID,
type: "get", type: "get",
success: function (data) { success: function (data) {
getRightdata.set_XCJC_Detail(data); getRightdata.set_XCJC_Detail(data);
...@@ -705,4 +705,4 @@ $(function () { ...@@ -705,4 +705,4 @@ $(function () {
getLeftdata.init(); getLeftdata.init();
getBottomData.init(); getBottomData.init();
}); });
\ No newline at end of file \ No newline at end of file
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