修改

shuishen

2021-03-17 d266294dd3929fcc71fbcb7943527559c13a2b8a

修改

 src/page/index/logo.vue

@@ -20,6 +20,10 @@
        :append-to-body="true"
        :close-on-press-escape="false"
        :close-on-click-modal="false"
<<<<<<< HEAD
=======
        :show-close="false"
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
        @close="closeDialog"
      >
        <el-form
@@ -64,6 +68,7 @@
                  disabled="true"
                  v-model="form.phoneNumber"
                  autocomplete="off"
<<<<<<< HEAD
                  style="width: calc(100% - 110px)"
                ></el-input>
                <el-button
@@ -79,6 +84,9 @@
                  <i class="el-icon-phone-outline"></i>
                  联系负责人
                </el-button>
=======
                ></el-input>
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
              </el-form-item>
            </el-col>
          </el-row>
@@ -153,6 +161,7 @@
              </el-form-item>
            </el-col>
            <el-col span="12">
<<<<<<< HEAD
              <el-form-item label="监控视频">
                <el-button type="success" @click.stop="queryOldVideo(form)"
                  >视频通话
@@ -162,16 +171,38 @@
                </el-button>
              </el-form-item>
            </el-col>
=======
              <el-form-item label="备注">
                <el-input v-model="form.bz" autocomplete="off"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-form-item label="报警内容">
              <el-input
                disabled="true"
                v-model="form.content"
                autocomplete="off"
              ></el-input>
            </el-form-item>
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
          </el-row>

          <el-row>
            <el-col span="12">
<<<<<<< HEAD
              <el-form-item label="报警内容">
                <el-input
                  disabled="true"
                  v-model="form.content"
                  autocomplete="off"
                ></el-input>
=======
              <el-form-item label="视频通话">
                <el-button type="primary" @click.stop="queryOldVideo(form)"
                  >查看视频
                </el-button>
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
              </el-form-item>
            </el-col>
            <el-col span="12">
@@ -186,6 +217,7 @@
          <el-row :align="center">
            <el-col class="opt-btn">
              <el-form-item>
<<<<<<< HEAD
                <el-button type="success" @click.stop="revoke(form)"
                  >办结</el-button
                >
@@ -199,6 +231,14 @@
                  alt=""
                />

=======
                <el-button type="warning" @click.stop="revoke(form)"
                  >办结</el-button
                >
                <el-button type="danger" class="push-nmb-btn"
                  >推送110</el-button
                >
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
                <el-button type="primary" @click.stop="generate(form)"
                  >派发保安</el-button
                >
@@ -604,7 +644,11 @@
  bottom: 0 !important;
  left: 0 !important;
  right: 400px !important;
<<<<<<< HEAD
  height: 558px !important;
=======
  height: 630px !important;
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
  border-radius: 10px 10px 10px 10px;
}

@@ -625,7 +669,11 @@
  right: 0 !important;
  bottom: 0 !important;
  margin: auto !important;
<<<<<<< HEAD
  height: 558px;
=======
  height: 630px;
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
}

.ss-video-dialog .el-dialog .el-dialog__body {

 src/page/index/top/index.vue

@@ -19,8 +19,14 @@
      </span>
    </div>
    <div class="top-bar__right">
<<<<<<< HEAD
      
      <img src="/img/ydlg.png" style="height: 44px; vertical-align: middle;" alt="">
=======

      <img src="/img/ydlg.png" style="width: 100px;" alt="">
      
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
      <el-tooltip v-if="showColor"
                  effect="dark"
                  :content="$t('navbar.color')"

 src/styles/real.scss

@@ -1,4 +1,5 @@
.opt-btn {
<<<<<<< HEAD
    margin-bottom: 0px;
    height: 100%;
    text-align: center;
@@ -16,5 +17,21 @@
        }
    }
  
=======
    text-align: center;
    .el-form-item__content {
        margin-left: 0 !important;
        .el-button {
            width: 80px;
            height: 40px;
            margin: 0 40px;
        }
        .push-nmb-btn {
            width: 80px;
            height: 80px;
            border-radius: 50%;
        }
    }
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
}


 src/views/realTimePolice/real.vue

@@ -262,6 +262,7 @@
            </el-form-item>
          </el-col>
          <el-col span="12">
<<<<<<< HEAD
            <el-form-item label="监控视频">
              <el-button type="success" @click.stop="queryOldVideo(form)"
                >视频通话
@@ -269,10 +270,15 @@
              <el-button type="primary" @click.stop="queryOldVideo(form)"
                >查看历史
              </el-button>
=======
            <el-form-item label="备注">
              <el-input v-model="form.bz" autocomplete="off"></el-input>
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
            </el-form-item>
          </el-col>
        </el-row>

<<<<<<< HEAD
        <el-row>
          <el-col span="12">
            <el-form-item label="报警内容">
@@ -281,6 +287,24 @@
                v-model="form.content"
                autocomplete="off"
              ></el-input>
=======
        <el-row>
          <el-form-item label="报警内容">
            <el-input
              disabled="true"
              v-model="form.content"
              autocomplete="off"
            ></el-input>
          </el-form-item>
        </el-row>

        <el-row>
          <el-col span="12">
            <el-form-item label="视频通话">
              <el-button type="primary" @click.stop="queryOldVideo(form)"
                >查看视频
              </el-button>
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
            </el-form-item>
          </el-col>
          <el-col span="12">
@@ -301,6 +325,7 @@
                @click.stop="aKeyToCall($event, form)"
                >查看视频
              </el-button> -->
<<<<<<< HEAD
              <el-button type="success" @click.stop="revoke(form)"
                >办结
              </el-button>
@@ -311,6 +336,12 @@
                alt=""
              />

=======
              <el-button type="warning" @click.stop="revoke(form)"
                >办结
              </el-button>
              <el-button type="danger" class="push-nmb-btn">推送110</el-button>
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
              <el-button type="primary" @click.stop="generate(form)"
                >派送保安
              </el-button>
@@ -343,12 +374,15 @@

import Recorder from "js-audio-recorder";

<<<<<<< HEAD
var newAddOper = axios.create({
  baseURL: "http://s16s652780.51mypc.cn",
  withCredentials: false,
  headers: {},
});

=======
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
export default {
  data() {
    return {
@@ -357,7 +391,11 @@
      videoSource: "",
      dialogTableVisible: false,
      innerVisibleVideo: false,
<<<<<<< HEAD
      activeClass: -1,
=======
      activeClass: 3,
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
      form: {},
      query: {},
      dateTime: [],
@@ -609,6 +647,7 @@
        (error) => {
          window.console.log(error);
          loading();
<<<<<<< HEAD
        }
      );
    },
@@ -629,6 +668,28 @@
        }
      );
    },
=======
        }
      );
    },
    rowUpdate(row, index, done, loading) {
      row.coordinate = "";
      update(row).then(
        () => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          done();
        },
        (error) => {
          window.console.log(error);
          loading();
        }
      );
    },
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
    rowDel(row) {
      this.$confirm("确定将选择数据删除?", {
        confirmButtonText: "确定",
@@ -647,7 +708,11 @@
        });
    },
    searchReset() {
<<<<<<< HEAD
      this.activeClass = -1;
=======
      this.activeClass = 3;
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
      this.query = {};
      this.onLoad(this.page);
    },
@@ -781,11 +846,14 @@
        currentData.getMinutes() < 10
          ? "0" + currentData.getMinutes()
          : currentData.getMinutes();
<<<<<<< HEAD
      //秒
      var currenS =
        currentData.getSeconds() < 10
          ? "0" + currentData.getSeconds()
          : currentData.getSeconds();
=======
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c

      return {
        week: {
@@ -816,6 +884,7 @@
            currenM +
            ":00",
        },
<<<<<<< HEAD
        current:
          currentY +
          "-" +
@@ -828,6 +897,8 @@
          currenM +
          ":" +
          currenS,
=======
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
      };
    },
    getBZdata(e) {
@@ -904,6 +975,11 @@
      this.dialogTableVisible = true;
    },
    generate(row) {
<<<<<<< HEAD
=======
      console.log(row);
      return;
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
      var that = this;
      if (row.czTime == "" || row.czTime == null) {
        this.$message({
@@ -945,6 +1021,7 @@
              message: "生成警单成功",
              type: "success",
            });
<<<<<<< HEAD

            that.updateJtyep(row);
            that.dialogTableVisible = false;
@@ -1099,6 +1176,142 @@
            .then((result) => {
              this.innerVisibleVideo = true;

=======

            that.updateJtyep(row);
            that.dialogTableVisible = false;
            var arr = [];
            that.$store.state.tags.tagList.forEach((item) => {
              if (item.label != "警情分发处置") {
                arr.push(item);
              }
            });
            that.$store.state.tags.tagList = arr;

            row.type = 0;
            row.id = response.data.data;
            that.$router.push({ path: "/distribution/index", query: row });
          })
          .catch(function (error) {
            that.dialogTableVisible = false;
          });
      }
    },
    revoke(row) {
      var that = this;
      axios({
        url: "/api/blade-jfpts/alarm/alarm/deletejj?id=" + row.id,
        method: "post",
      }).then(function () {
        that.dialogTableVisible = false;
        that.onLoad(that.page, that.query);
      });
    },
    updateJtyep(row) {
      var that = this;
      axios({
        url:
          "/api/blade-jfpts/alarm/alarm/updateJtype?id=" +
          row.id +
          "&czTime=" +
          row.czTime +
          "&bz=" +
          row.bz,
        method: "post",
      }).then(function () {
        that.onLoad(that.page, that.query);
      });
    },

    beginTimeOrEndTime(time) {
      var beginTime = new Date(time);

      var endTime = new Date(new Date(time).valueOf() - 1000 * 60 * 60 * 3);

      var beginY = beginTime.getFullYear();

      var beginM =
        beginTime.getMonth() + 1 < 10
          ? "0" + (beginTime.getMonth() + 1)
          : beginTime.getMonth() + 1;

      var beginD =
        beginTime.getDate() < 10
          ? "0" + beginTime.getDate()
          : beginTime.getDate();

      var beginH =
        beginTime.getHours() < 10
          ? "0" + beginTime.getHours()
          : beginTime.getHours();

      var beginm =
        beginTime.getMinutes() < 10
          ? "0" + beginTime.getMinutes()
          : beginTime.getMinutes();

      var begins =
        beginTime.getSeconds() < 10
          ? "0" + beginTime.getSeconds()
          : beginTime.getSeconds();

      var endY = endTime.getFullYear();

      var endM =
        endTime.getMonth() + 1 < 10
          ? "0" + (endTime.getMonth() + 1)
          : endTime.getMonth() + 1;

      var endD =
        endTime.getDate() < 10 ? "0" + endTime.getDate() : endTime.getDate();

      var endH =
        endTime.getHours() < 10 ? "0" + endTime.getHours() : endTime.getHours();

      var endm =
        endTime.getMinutes() < 10
          ? "0" + endTime.getMinutes()
          : endTime.getMinutes();

      var ends =
        endTime.getSeconds() < 10
          ? "0" + endTime.getSeconds()
          : endTime.getSeconds();
      return {
        begin: beginY + beginM + beginD + beginH + beginm + begins,
        end: endY + endM + endD + endH + endm + ends,
      };
    },
    queryOldVideo(data) {
      var newAxios = axios.create({
        baseURL: "https://web.byisf.com:18000",
        withCredentials: false,
        headers: {
          "Content-type": "application/x-www-form-urlencoded",
        },
      });

      var time = this.beginTimeOrEndTime(data.alarmTime);

      newAxios
        .post(
          "/api_control",
          {},
          {
            params: {
              param: JSON.stringify({ PktType: "GetAccessToken" }),
            },
          }
        )
        .then((res) => {
          newAxios
            .get(
              `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${data.serialNumber}&chl=${data.channelNumber}`
            )
            .then((result) => {
              this.innerVisibleVideo = true;

>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
              this.videoSource = result.data.data.m3u8;
            });


 vue.config.js

@@ -35,7 +35,7 @@
            '/api': {
                //本地服务接口地址
                //target: 'http://localhost:82/',
                target: 'http://web.byisf.com:18001/api/',
                target: 'https://web.byisf.com:18001/api/',
                //远程演示服务地址,可用于直接启动项目
                //target: 'https://saber.bladex.vip/api',
                ws: true,
@@ -45,4 +45,4 @@
            }
        }
    }
};
};