Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/qdtlui

src/components/map/index.vue

@@ -70,6 +70,7 @@ import { Feature } from "ol";
 // import {Feature} from "ol";
 import videodiv from "@/components/Videoplayer/index.vue"
 import {LineString, Point} from "ol/geom";
+import { scale } from 'ol/coordinate';
 // import {Icon, Stroke, Style} from "ol/style";
 // import {Vector as LayerVec} from "ol/layer";
 
@@ -332,7 +333,8 @@ const vector = new LayerVec({
                     image: new Icon({
                         color: "#eee",
                         crossOrigin: "anonymous",
-                        src: require("../../assets/images/icons/" + icon) //本地的样式
+                        src: require("../../assets/images/icons/" + icon), //本地的样式
+                        scale:size
                     })
                 })
             ); //这里是样式

src/views/qdtl/video/index.vue

@@ -78,6 +78,7 @@ export default {
           label: 'label'
         },
         filterText:'',
+        jsonArry:[],
         pointIdArry:[],
         regionIndexCode:'',
         queryParams:{
@@ -121,13 +122,22 @@ export default {
         //   resolve(data);
         // }, 500);
 
-        if (node.level > 1) return resolve([]);
+        if (node.level > 3) return resolve([]);
+        if(node.level <3){
+              var childrens = []
+              for(var index in this.jsonArry){
+                      if(node.data.id == this.jsonArry[index].parentIndexCode){
+                           childrens.push(this.jsonArry[index]);
+                      }
+              }
+                 resolve(childrens);
+        }
 
-        if(node.level === 1){
+        if(node.level === 3){
              this.videoParams.params = '{"httpMethod":"POST","path":"/api/resource/v1/regions/regionIndexCode/cameras","headers":{},"query":{},"parameter":{},"body":{"pageNo": 1,"pageSize": 200,"regionIndexCode": "'+node.data.indexCode+'"},"contentType":"application/json;charset=UTF-8","mock":false,"appKey":"27794545","appSecret":"5Xi27Gl7JrbHHF1MpdaB"}'
                   httpRequest(this.videoParams).then(data =>{
                         var json = JSON.parse(data.data);
-                        console.log(json);
+                        // console.log(json);
                         var childerns = [];
                         for(var index in json.data.list){
                           // console.log();
@@ -145,23 +155,35 @@ export default {
         },
         getvideo(){
            httpRequest(this.queryParams).then(response => {
-               console.log(response);
+              //  console.log(response);
                var json = JSON.parse(response.data);
                console.log(json);
                for(var index in json.data.list){
-                  var obj = json.data.list[index]
-                  obj.id = obj.indexCode;
-                  obj.label = obj.name;
-                  obj.data = obj;
-                  this.videoData.push(obj);
-                  // this.regionIndexCode = obj.indexCode;
-                  // httpRequest(this.videoParams).then(data =>{
-                  //        console.log(data);
-                  // });
+                    obj = json.data.list[index]
+                    obj.id = obj.indexCode;
+                    obj.label = obj.name;
+                    obj.data = obj;
+                    var obj = json.data.list[index]
+                    obj.id = obj.indexCode;
+                    obj.label = obj.name;
+                    obj.data = obj;
+                    this.jsonArry.push(obj);
+                    if(obj.parentIndexCode == -1){
+                           this.videoData.push(obj)
+                    }
                }
+               console.log(this.jsonArry);
 
            });
         },
+      getTreeChildren(obj,data){
+            obj.children = []
+            for(var index in data){
+                  if(obj.id = data[index].parentIndexCode){
+                          obj.children.push(data[index]);
+                  }
+            }
+      },
        getList() {
             listVideo().then(response => {
                 console.log(response);
@@ -195,7 +217,7 @@ export default {
               if(node == false){
                    this.$refs.mapv.removeLayer(data.id);
               }else if(node == true){
-                   this.$refs.mapv.addMarker(data.lnglat.split(','),'监控 (2) 拷贝 20.png',0.2,data.id,data);
+                   this.$refs.mapv.addMarker(data.lnglat.split(','),'监控 (2) 拷贝 20.png',0.8,data.id,data);
               }
 
           }