Skip to content

platform / fanxing_new

Go to a project
Commit 68ab860b by 潘建波
Options

修改视频资源修改后不刷新问题

1 parent 463b27e4
Expand all
Inline Side-by-side
Showing 8 changed files with 43 additions and 12 deletions
dist.zip
No preview for this file type
public/js/version.json
{"commit":"0f836ae1db6fa125fb5b8de516d3bc87216e607c","commitDate":"2020-9-18 13:43","buildDate":"2020-9-28 18:1","version":"2.0.8","info":"【NEW】添加日志 【NEW】增加加密方式 【BUG】去除地点名称限制 【BUG】点击主节点之后再点击平台，不可以显示平台的信息 【BUG】上传时间是调用的utc时间"}
\ No newline at end of file \ No newline at end of file
{"commit":"463b27e4ce45ee1406fd848cc3af744223fcc6a6","commitDate":"2020-10-9 14:18","buildDate":"2020-10-9 14:19","version":"2.0.8","info":"增加组织机构日志"}
\ No newline at end of file \ No newline at end of file
src/views/resource/treeComponents/cameraDialog.vue
...@@ -118,6 +118,7 @@ export default { ...@@ -118,6 +118,7 @@ export default {
longitude: "", longitude: "",
latitude: "" latitude: ""
}, },
curNode:null,
initParam: {}, initParam: {},
cameraAddVisible: false, cameraAddVisible: false,
dirCodeList: [], dirCodeList: [],
...@@ -139,6 +140,7 @@ export default { ...@@ -139,6 +140,7 @@ export default {
}, },
methods: { methods: {
initDialog(node, type, devsId) { initDialog(node, type, devsId) {
this.curNode = node;
this.cameraAddVisible = true; this.cameraAddVisible = true;
this.devsId = devsId; this.devsId = devsId;
if (type == "add") { if (type == "add") {
...@@ -239,6 +241,8 @@ export default { ...@@ -239,6 +241,8 @@ export default {
org_type: "address", org_type: "address",
unid: this.addVideoParam.addr_unid unid: this.addVideoParam.addr_unid
}; };
debugger
this.$emit("setCamerInfo","");
this.$emit("getData", data); this.$emit("getData", data);
// this.$emit("getData", data); // this.$emit("getData", data);
this.cameraAddVisible = false; this.cameraAddVisible = false;
......
src/views/resource/treeComponents/cameraTree.vue
...@@ -272,7 +272,6 @@ export default { ...@@ -272,7 +272,6 @@ export default {
editObj[0].unid editObj[0].unid
) )
.then(data => { .then(data => {
debugger
let type = this.editForm.targetType; let type = this.editForm.targetType;
if(type == 'org') { if(type == 'org') {
this.$logs.oplogs(res,'serv_vchan',`修改组织${this.editForm.name}`); this.$logs.oplogs(res,'serv_vchan',`修改组织${this.editForm.name}`);
......
src/views/resource/videoEquipment.vue
...@@ -243,6 +243,10 @@ export default { ...@@ -243,6 +243,10 @@ export default {
syncdetail(index, data) { syncdetail(index, data) {
this.$refs.syncdetail.initDialog(data); this.$refs.syncdetail.initDialog(data);
}, },
setCamerInfo(){
debugger
this.getCameraTree();
},
getCameraTree() { getCameraTree() {
this.tableType = "camera"; this.tableType = "camera";
this.$api.resource this.$api.resource
...@@ -313,7 +317,7 @@ export default { ...@@ -313,7 +317,7 @@ export default {
this.cameraTree = res.vchan_struct; this.cameraTree = res.vchan_struct;
this.cameraArr = []; this.cameraArr = [];
this.cameraTreeData = this.cameraBuildTree(res.vchan_struct); this.cameraTreeData = this.cameraBuildTree(res.vchan_struct);
// this.getTable(data, "camera"); this.getTable(data, "camera");
}); });
}, },
syncBuildTree(data) { syncBuildTree(data) {
...@@ -460,11 +464,13 @@ export default { ...@@ -460,11 +464,13 @@ export default {
getTable(data, type) { getTable(data, type) {
if (data.org_type != "root") { if (data.org_type != "root") {
this.tableType = type; this.tableType = type;
debugger
if (this.tableType == "camera") { if (this.tableType == "camera") {
if (data.type) { if (data.type || data.org_type) {
this.tableType = type; this.tableType = type;
this.formattterData = []; this.formattterData = [];
let filterData = []; let filterData = [];
debugger
let search_params = { let search_params = {
vchan_type: "camera", vchan_type: "camera",
org_unid: data.unid org_unid: data.unid
......
src/views/trafficShow/map.vue
...@@ -68,6 +68,8 @@ import { ...@@ -68,6 +68,8 @@ import {
defaults as defaultInteractions, defaults as defaultInteractions,
Pointer as PointerInteraction Pointer as PointerInteraction
} from "ol/interaction"; //交互，选择，画框等 } from "ol/interaction"; //交互，选择，画框等
import ImageWMS from 'ol/source/ImageWMS';
import TileWMS from 'ol/source/TileWMS';
import { import {
Circle as CircleStyle, Circle as CircleStyle,
Fill, Fill,
...@@ -190,20 +192,35 @@ export default { ...@@ -190,20 +192,35 @@ export default {
url: path url: path
}) })
}); });
var wmsSource = new ImageWMS({
        url: 'https://ahocevar.com/geoserver/wms',
        params: {'LAYERS': 'ne:ne'},
serverType: 'geoserver',
crossOrigin: 'anonymous',
      });
Views = new View({       var wmsLayer = new TileLayer({
projection: "EPSG:4326",         source:wmsSource ,
zoom: 2, // 并且定义地图显示层级为2       });
minZoom: 13,
maxZoom: 18,     
center: mapcenter Views = new View({
});          center: [0, 0],
        zoom: 1
      });
// Views = new View({
// projection: "EPSG:4326",
// zoom: 2, // 并且定义地图显示层级为2
// minZoom: 13,
// maxZoom: 18,
// center: mapcenter
// });
map = new Map({ map = new Map({
controls: defaultControls().extend([new RotateNorthControl()]), controls: defaultControls().extend([new RotateNorthControl()]),
// 设置地图图层 // 设置地图图层
layers: [ layers: [
// 创建一个使用Open Street Map地图源的瓦片图层 // 创建一个使用Open Street Map地图源的瓦片图层
offlineMapLayer     wmsLayer 
], ],
loadTilesWhileAnimating: true, loadTilesWhileAnimating: true,
......
src/views/trafficShow/map.xml 0 → 100644
<ServiceExceptionReport xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.3.0" xsi:schemaLocation="http://www.opengis.net/ogc https://ahocevar.com/geoserver/schemas/wms/1.3.0/exceptions_1_3_0.xsd">
<ServiceException code="MissingParameterValue" locator="request">
Could not determine geoserver request from http request org.geoserver.platform.AdvancedDispatchFilter$AdvancedDispatchHttpRequest@3df6b271
</ServiceException>
</ServiceExceptionReport>
\ No newline at end of file \ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!