Merge branch 'refs/heads/master' into develop-add-api-key

leesam

2024-04-10 ce950dea4aef933a12e78e4fe1f535ba9a83c3df

 web_src/src/components/map.vue

old mode 100644
new mode 100755
@@ -243,7 +243,7 @@
    },
    getImageByChannel: function (channel) {
      let src = "static/images/gis/camera.png"
      switch (channel.ptztype) {
      switch (channel.ptzType) {
        case 1:
          if (channel.status === 1) {
            src = "static/images/gis/camera1.png"