diff --git a/src/api/model/am.js b/src/api/model/am.js index 11139fc1..96159891 100644 --- a/src/api/model/am.js +++ b/src/api/model/am.js @@ -79,6 +79,48 @@ export default { } }, }, + tdevice:{ + bindArea:{ + name: "绑定所在区域", + req: async function(data){ + return await http.post( + `${config.API_URL}/third/tdevice/bind_area/`,data + ); + } + }, + dchannel:{ + name: "闸机通道列表", + req: async function(data){ + return await http.post( + `${config.API_URL}/third/tdevice/dchannel/`,data + ); + } + }, + labelLocation:{ + name: "标注坐标位置", + req: async function(data){ + return await http.post( + `${config.API_URL}/third/tdevice/label_location/`,data + ); + } + }, + vchannel:{ + name: "/third/tdevice/vchannel/", + req: async function(data){ + return await http.post( + `${config.API_URL}/third/tdevice/vchannel/`,data + ); + } + }, + speaker:{ + name: "喇叭列表", + req: async function(data){ + return await http.post( + `${config.API_URL}/third/tdevice/speaker/`,data + ); + } + }, + }, diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index 6fd54772..f03953de 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -277,7 +277,7 @@ export default { // delete reqData[config.request.pageSize] } Object.assign(reqData, this.tableParams); - + debugger; try { var res = await this.apiObj.req(reqData); if (this.hidePagination) { @@ -308,7 +308,7 @@ export default { if (this.hidePagination) { dataList = response.data || []; } else { - dataList = response.rows?response.rows:response.data.pageData?response.data.pageData:[]; + dataList = response.rows?response.rows:response.data.rows?response.data.rows:response.data.pageData?response.data.pageData:[]; } if(this.$route.path==='/sys/dept'||this.$route.path==='/ops/menu'){ this.tableData = this.redata(dataList); diff --git a/src/config/route.js b/src/config/route.js index 6c36bbb8..3af78ea6 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -400,6 +400,15 @@ const routes = [ "icon": "el-icon-menu", }, "component": "am/monitor" + }, + { + "name": "audio", + "path": "/am/audio", + "meta": { + "title": "喇叭通道", + "icon": "el-icon-menu", + }, + "component": "am/audio" }, ] }, diff --git a/src/views/am/area_rail_form.vue b/src/views/am/area_rail_form.vue index 1b004e39..8cb65c37 100644 --- a/src/views/am/area_rail_form.vue +++ b/src/views/am/area_rail_form.vue @@ -81,9 +81,6 @@ mapServerURL: 'data/map', enableShadows: false, //是否开启阴影 默认false enableLighting: false, //是否开发光照 默认false - luminanceAtZenith: 0.54, //纹理亮度 - scatteringIntensity: 1.0, //镜面强度 - specularIntensity: 0, //散射强度 mapScaleLevelRange: [16, 23],//比例尺级别范围， 16级到23级,默认[1,24] floorControlOptions: { floorHeight: 20,//楼层间距 @@ -93,10 +90,19 @@ y: 10, }//控件偏移位置 }, - imageryProvider: jsmap.JSImageryProviderType.VECTOR_OSM, + imageryProvider: jsmap.JSImageryProviderType.IMAGE_TDT, backgroundColor: '#3798ff', //背景颜色 - defaultTiltAngle: 30, //默认倾斜角设置，动态效果请参看地图演示平台 - defaultRotateAngle: 60, //默认旋转角设置，动态效果请参看地图演示平台 + viewOptions: { + //屏幕中心坐标 + center: {x: 114.63059258861512, y: 38.81407163905287, z: 1}, + // center: {x:120,y:30,z:10}, + //相机距屏幕中心点距离（单位m） + distance: 400, + // 旋转角（单位°） + rotate: 0, + //倾斜角（单位°） + tilt: 45, + } }); window.map.openMapById('0000'); window.map.on('loadComplete', e => { diff --git a/src/views/am/audio.vue b/src/views/am/audio.vue new file mode 100644 index 00000000..2cfdb7c2 --- /dev/null +++ b/src/views/am/audio.vue @@ -0,0 +1,88 @@ + + diff --git a/src/views/am/em1.vue b/src/views/am/em1.vue index e69de29b..e8604f88 100644 --- a/src/views/am/em1.vue +++ b/src/views/am/em1.vue @@ -0,0 +1,104 @@ + + diff --git a/src/views/am/monitor.vue b/src/views/am/monitor.vue index 8edce40d..79879312 100644 --- a/src/views/am/monitor.vue +++ b/src/views/am/monitor.vue @@ -3,7 +3,7 @@
- +
@@ -27,6 +27,7 @@