Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

shuishen

2021-02-04 a7a86324ae4e519b8ee0a3fa3038f3afa2e14dec

 src/page/index/logo.vue

@@ -16,7 +16,7 @@
    <audio ref='realAudio' loop>
    </audio>
    <div>
      <el-dialog  class="real-dialog" title="实时警情" :visible.sync="dialogTableVisible" append-to-body="true" @close='closeDialog'>
      <el-dialog  class="real-dialog" title="实时警情" center="true" :visible.sync="dialogTableVisible" top="190px" append-to-body="true" @close='closeDialog'>
        <el-form :model="form" label-position="right" size="mini" label-width="100px">
          <el-row>
            <el-col span="12">
@@ -138,7 +138,7 @@
        var that = this;

        axios({
          url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/getLimit',
          url: '/api/blade-jfpts/alarm/alarm/getLimit',
          method: 'get',
        }).then(function (response) {
          that.deviceId = response.data.data[0].id;
@@ -152,7 +152,7 @@
        window.clearTimeout(window.realTimeQuery);
        window.realTimeQuery = setInterval(function () {
          axios({
            url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/selecttx?id='+that.deviceId,
            url: '/api/blade-jfpts/alarm/alarm/selecttx?id='+that.deviceId,
            method: 'post',
          }).then(function (response) {
            if (response.data.data.length > 0){
@@ -181,7 +181,7 @@
          });
        }else{
          axios({
            url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/jingdan/jingdan/submit',
            url: '/api/blade-jfpts/jingdan/jingdan/submit',
            method: 'post',
            data: {
              rName: row.rname,
@@ -224,7 +224,7 @@
      revoke(row){
        var that = this;
        axios({
          url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/deletejj?id='+row.id,
          url: '/api/blade-jfpts/alarm/alarm/deletejj?id='+row.id,
          method: 'post',
        }).then(function () {
          that.dialogTableVisible = false;
@@ -236,7 +236,7 @@
      },updateJtyep(row){
        var that = this;
        axios({
          url: 'https://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/updateJtype?id='+row.id+"&czTime="+row.czTime+"&bz="+row.bz,
          url: '/api/blade-jfpts/alarm/alarm/updateJtype?id='+row.id+"&czTime="+row.czTime+"&bz="+row.bz,
          method: 'post',
        }).then(function () {
        });
@@ -301,4 +301,22 @@
  }


  .real-dialog .el-dialog__header{
    padding-top: 10px;
    background: linear-gradient(45deg, #ff0000, #ff3c3c);
    border-radius: 10px 10px 0 0;
  }

  .real-dialog .el-dialog__header .el-dialog__title{
    color: white;
  }
  .real-dialog .el-dialog__header .el-dialog__headerbtn{
    top: 15px;
  }

  .real-dialog .el-dialog{
    border-radius: 10px 10px 10px 10px;
  }


</style>