合并开源主线

648540858

2023-04-04 b4048fbe80dba8e7756ae557a15ab60b4f80a44b

 web_src/src/components/channelList.vue

@@ -69,7 +69,7 @@
            <span v-if="scope.row.longitude*scope.row.latitude === 0">无</span>
          </template>
        </el-table-column>
        <el-table-column prop="ptztypeText" label="云台类型" min-width="120"/>
        <el-table-column prop="PTZTypeText" label="云台类型" min-width="120"/>
        <el-table-column label="开启音频" min-width="120">
          <template slot-scope="scope">
            <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
@@ -206,7 +206,7 @@
      if (typeof (this.$route.params.deviceId) == "undefined") return;
      this.$axios({
        method: 'get',
        url: `./api/device/query/devices/${this.$route.params.deviceId}/channels`,
        url: `/api/device/query/devices/${this.$route.params.deviceId}/channels`,
        params: {
          page: that.currentPage,
          count: that.count,
@@ -238,7 +238,7 @@
      let that = this;
      this.$axios({
        method: 'get',
        url: './api/play/start/' + deviceId + '/' + channelId
        url: '/api/play/start/' + deviceId + '/' + channelId
      }).then(function (res) {
        console.log(res)
        that.isLoging = false;
@@ -278,7 +278,7 @@
      var that = this;
      this.$axios({
        method: 'get',
        url: './api/play/stop/' + this.deviceId + "/" + itemData.channelId
        url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId
      }).then(function (res) {
        that.initData();
      }).catch(function (error) {
@@ -334,7 +334,7 @@
      if (!this.showTree) {
        this.$axios({
          method: 'get',
          url: `./api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
          url: `/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
          params: {
            page: this.currentPage,
            count: this.count,
@@ -358,7 +358,7 @@
      }else {
        this.$axios({
          method: 'get',
          url: `./api/device/query/tree/channel/${this.deviceId}`,
          url: `/api/device/query/tree/channel/${this.deviceId}`,
          params: {
            parentId: this.parentChannelId,
            page: this.currentPage,
@@ -387,7 +387,7 @@
    updateChannel: function (row) {
      this.$axios({
        method: 'post',
        url: `./api/device/query/channel/update/${this.deviceId}`,
        url: `/api/device/query/channel/update/${this.deviceId}`,
        params: row
      }).then(function (res) {
        console.log(JSON.stringify(res));