Merge branch 'wvp-28181-2.0' into fix-269

648540858

2023-02-01 2b1f7a47394363e95deb4dfa0f1c67d41e747f7f

 web_src/src/components/DeviceList.vue

@@ -1,44 +1,42 @@
<template>
   <div id="app">
      <el-container>
         <el-header>
            <uiHeader></uiHeader>
         </el-header>
         <el-main>
            <div style="background-color: #FFFFFF; margin-bottom: 1rem; position: relative; padding: 0.5rem; text-align: left;">
               <span style="font-size: 1rem; font-weight: bold;">设备列表</span>
               <div style="position: absolute; right: 1rem; top: 0.3rem;">
                  <el-button icon="el-icon-refresh-right" circle size="mini" :loading="getDeviceListLoading" @click="getDeviceList()"></el-button>
  <div id="app" style="width: 100%">
    <div class="page-header">
      <div class="page-title">设备列表</div>
      <div class="page-header-btn">
        <el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="add">添加设备
        </el-button>
        <el-button icon="el-icon-refresh-right" circle size="mini" :loading="getDeviceListLoading"
                   @click="getDeviceList()"></el-button>
               </div>
            </div>
            <!-- <devicePlayer ref="devicePlayer"></devicePlayer> -->
            <!--设备列表-->
            <el-table :data="deviceList" border style="width: 100%;font-size: 12px;" :height="winHeight">
               <el-table-column prop="name" label="名称"  align="center">
    <el-table :data="deviceList" style="width: 100%;font-size: 12px;" :height="winHeight" header-row-class-name="table-header">
      <el-table-column prop="name" label="名称" min-width="160">
               </el-table-column>
               <el-table-column prop="deviceId" label="设备编号" width="180" align="center">
      <el-table-column prop="deviceId" label="设备编号" min-width="200" >
               </el-table-column>
          <el-table-column label="地址" width="180" align="center">
      <el-table-column label="地址" min-width="160" >
            <template slot-scope="scope">
              <div slot="reference" class="name-wrapper">
                <el-tag size="medium">{{ scope.row.hostAddress }}</el-tag>
            <el-tag v-if="scope.row.hostAddress" size="medium">{{ scope.row.hostAddress }}</el-tag>
            <el-tag v-if="!scope.row.hostAddress" size="medium">未知</el-tag>
              </div>
            </template>
          </el-table-column>
               <el-table-column prop="manufacturer" label="厂家" align="center">
      <el-table-column prop="manufacturer" label="厂家" min-width="120" >
               </el-table-column>
               <el-table-column label="流传输模式" align="center" width="120">
      <el-table-column label="流传输模式"  min-width="160" >
            <template slot-scope="scope">
              <el-select size="mini" @change="transportChange(scope.row)" v-model="scope.row.streamMode" placeholder="请选择">
          <el-select size="mini" @change="transportChange(scope.row)" v-model="scope.row.streamMode" placeholder="请选择" style="width: 120px">
                <el-option key="UDP" label="UDP" value="UDP"></el-option>
                <el-option key="TCP-ACTIVE" label="TCP主动模式" :disabled="true" value="TCP-ACTIVE"></el-option>
                <el-option key="TCP-PASSIVE" label="TCP被动模式"  value="TCP-PASSIVE"></el-option>
              </el-select>
            </template>
               </el-table-column>
               <el-table-column prop="channelCount" label="通道数" align="center">
      <el-table-column prop="channelCount" label="通道数" min-width="120" >
               </el-table-column>
               <el-table-column label="状态" width="120" align="center">
      <el-table-column label="状态" min-width="120">
                  <template slot-scope="scope">
                     <div slot="reference" class="name-wrapper">
                        <el-tag size="medium" v-if="scope.row.online == 1">在线</el-tag>
@@ -46,24 +44,32 @@
                     </div>
                  </template>
               </el-table-column>
          <el-table-column prop="keepaliveTime" label="最近心跳" align="center" width="140">
      <el-table-column prop="keepaliveTime" label="最近心跳" min-width="160" >
          </el-table-column>
          <el-table-column prop="registerTime" label="最近注册" align="center" width="140">
      <el-table-column prop="registerTime" label="最近注册"  min-width="160">
          </el-table-column>
          <el-table-column prop="updateTime" label="更新时间" align="center" width="140">
          </el-table-column>
          <el-table-column prop="createTime" label="创建时间" align="center" width="140">
          </el-table-column>
<!--      <el-table-column prop="updateTime" label="更新时间"  width="140">-->
<!--      </el-table-column>-->
<!--      <el-table-column prop="createTime" label="创建时间"  width="140">-->
<!--      </el-table-column>-->

               <el-table-column label="操作" width="360" align="center" fixed="right">
      <el-table-column label="操作" min-width="450" fixed="right">
                  <template slot-scope="scope">
                     <el-button size="mini" :ref="scope.row.deviceId + 'refbtn' "  v-if="scope.row.online!=0" icon="el-icon-refresh"  @click="refDevice(scope.row)">刷新</el-button>
                     <el-button-group>
                <el-button size="mini" icon="el-icon-video-camera-solid" v-bind:disabled="scope.row.online==0"  type="primary" @click="showChannelList(scope.row)">通道</el-button>
                <el-button size="mini" icon="el-icon-location" v-bind:disabled="scope.row.online==0"  type="primary" @click="showDevicePosition(scope.row)">定位</el-button>
                <el-button size="mini" icon="el-icon-edit" type="primary" @click="edit(scope.row)">编辑</el-button>
                <el-button size="mini" icon="el-icon-delete" type="danger" v-if="scope.row.online==0"  @click="deleteDevice(scope.row)">删除</el-button>
                     </el-button-group>
          <el-button type="text" size="medium" v-bind:disabled="scope.row.online==0" icon="el-icon-refresh" @click="refDevice(scope.row)"
                     @mouseover="getTooltipContent(scope.row.deviceId)">刷新
          </el-button>
          <el-divider direction="vertical"></el-divider>
          <el-button type="text" size="medium" icon="el-icon-video-camera"
                     @click="showChannelList(scope.row)">通道
          </el-button>
          <el-divider direction="vertical"></el-divider>
          <el-button size="medium" icon="el-icon-location" type="text"
                     @click="showDevicePosition(scope.row)">定位
          </el-button>
          <el-divider direction="vertical"></el-divider>
          <el-button size="medium" icon="el-icon-edit" type="text" @click="edit(scope.row)">编辑</el-button>
          <el-divider direction="vertical"></el-divider>
          <el-button size="medium" icon="el-icon-delete" type="text" @click="deleteDevice(scope.row)" style="color: #f56c6c">删除</el-button>
                     </template>
               </el-table-column>
            </el-table>
@@ -78,19 +84,21 @@
               :total="total">
            </el-pagination>
        <deviceEdit ref="deviceEdit" ></deviceEdit>
         </el-main>
      </el-container>
    <syncChannelProgress ref="syncChannelProgress"></syncChannelProgress>
   </div>
</template>

<script>
   import uiHeader from './UiHeader.vue'
import uiHeader from '../layout/UiHeader.vue'
   import deviceEdit from './dialog/deviceEdit.vue'
import syncChannelProgress from './dialog/SyncChannelProgress.vue'

   export default {
      name: 'app',
      components: {
         uiHeader,
      deviceEdit
    deviceEdit,
    syncChannelProgress,
      },
      data() {
         return {
@@ -104,7 +112,7 @@
            currentPage:1,
            count:15,
            total:0,
            getDeviceListLoading: false
      getDeviceListLoading: false,
         };
      },
      computed: {
@@ -117,8 +125,6 @@
               });
               this.currentDeviceChannelsLenth = channels.length;
            }

            console.log("数据：" + JSON.stringify(channels));
            return channels;
         }
      },
@@ -143,96 +149,114 @@
            this.getDeviceList();
         },
         getDeviceList: function() {
            let that = this;
            this.getDeviceListLoading = true;
            this.$axios({
               method: 'get',
               url:`/api/device/query/devices`,
               params: {
                  page: that.currentPage,
                  count: that.count
          page: this.currentPage,
          count: this.count
               }
            }).then(function (res) {
               console.log(res);
               console.log(res.data.list);
               that.total = res.data.total;
               that.deviceList = res.data.list;
               that.getDeviceListLoading = false;
            }).catch(function (error) {
               console.log(error);
               that.getDeviceListLoading = false;
      }).then( (res)=> {
        if (res.data.code === 0) {
          this.total = res.data.data.total;
          this.deviceList = res.data.data.list;
        }
        this.getDeviceListLoading = false;
      }).catch( (error)=> {
        console.error(error);
        this.getDeviceListLoading = false;
            });

         },
      deleteDevice: function(row) {
            let that = this;
      let msg = "确定删除此设备？"
      if (row.online !== 0) {
        msg = "在线设备删除后仍可通过注册再次上线。<br/>如需彻底删除请先将设备离线。<br/><strong>确定删除此设备？</strong>"
      }
      this.$confirm(msg, '提示', {
        dangerouslyUseHTMLString: true,
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        center: true,
        type: 'warning'
      }).then(() => {
            this.$axios({
               method: 'delete',
               url:`/api/device/query/devices/${row.deviceId}/delete`
            }).then((res)=>{
          this.getDeviceList();
            }).catch((error) =>{
               console.log(error);
          console.error(error);
            });
      }).catch(() => {

      });


         },
         showChannelList: function(row) {
            console.log(JSON.stringify(row))
            this.$router.push(`/channelList/${row.deviceId}/0/15/1`);
      this.$router.push(`/channelList/${row.deviceId}/0`);
         },
         showDevicePosition: function(row) {
            console.log(JSON.stringify(row))
            this.$router.push(`/devicePosition/${row.deviceId}/0/15/1`);
      this.$router.push(`/map?deviceId=${row.deviceId}`);
         },

         //gb28181平台对接
         //刷新设备信息
         refDevice: function(itemData) {
            console.log("刷新对应设备:" + itemData.deviceId);
            var that = this;
            that.$refs[itemData.deviceId + 'refbtn' ].loading = true;
      let that = this;
            this.$axios({
               method: 'post',
        method: 'get',
               url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
            }).then(function(res) {
      }).then((res) => {
               console.log("刷新设备结果："+JSON.stringify(res));
               if (!res.data.deviceId) {
        if (res.data.code !== 0) {
                  that.$message({
                     showClose: true,
                     message: res.data,
            message: res.data.msg,
                     type: 'error'
                  });
               }else{
                  that.$message({
                     showClose: true,
                     message: '请求成功',
                     type: 'success'
                  });
          // that.$message({
          //    showClose: true,
          //    message: res.data.msg,
          //    type: 'success'
          // });
          this.$refs.syncChannelProgress.openDialog(itemData.deviceId)
               }
               that.initData()
               that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
            }).catch(function(e) {
      }).catch((e) => {
               console.error(e)
               that.$refs[itemData.deviceId + 'refbtn' ].loading = false;
            });;
        that.$message({
          showClose: true,
          message: e,
          type: 'error'
        });
      });

         },
         //通知设备上传媒体流
         sendDevicePush: function(itemData) {
            // let deviceId = this.currentDevice.deviceId;
            // let channelId = itemData.channelId;
            // console.log("通知设备推流1：" + deviceId + " : " + channelId);
            // let that = this;
            // this.$axios({
            //    method: 'get',
            //    url: '/api/play/' + deviceId + '/' + channelId
            // }).then(function(res) {
            //    let ssrc = res.data.ssrc;
            //    that.$refs.devicePlayer.play(ssrc,deviceId,channelId);
            // }).catch(function(e) {
            // });

    getTooltipContent: async function (deviceId) {
      let result = "";
      await this.$axios({
        method: 'get',
        async: false,
        url: `/api/device/query/${deviceId}/sync_status/`,
      }).then((res) => {
        if (res.data.code == 0) {
          if (res.data.data.errorMsg !== null) {
            result = res.data.data.errorMsg
          } else if (res.data.msg !== null) {
            result = res.data.msg
          } else {
            result = `同步中...[${res.data.data.current}/${res.data.data.total}]`;
          }
        }
      })
      return result;
         },
      transportChange: function (row) {
        console.log(row);
        console.log(`修改传输方式为 ${row.streamMode}：${row.deviceId} `);
        let that = this;
        this.$axios({
@@ -244,7 +268,6 @@
        });
      },
      edit: function (row) {
        console.log(row);
        this.$refs.deviceEdit.openDialog(row, ()=>{
          this.$refs.deviceEdit.close();
          this.$message({
@@ -255,7 +278,20 @@
          setTimeout(this.getDeviceList, 200)

        })
    },
    add: function () {
      this.$refs.deviceEdit.openDialog(null, () => {
        this.$refs.deviceEdit.close();
        this.$message({
          showClose: true,
          message: "添加成功",
          type: "success",
        });
        setTimeout(this.getDeviceList, 200)

      })
      }


      }
   };
@@ -313,4 +349,5 @@
      padding: 0.3rem;
      width: 14.4rem;
   }

</style>