一些修改

shuishen

2021-03-17 15810bb853bc7b6ccf8267f7a505454bbebe1522

一些修改

 src/page/index/logo.vue

@@ -64,9 +64,21 @@
                  disabled="true"
                  v-model="form.phoneNumber"
                  autocomplete="off"
                  style="display: inline-block; width: calc(100% - 24px)"
                  style="width: calc(100% - 110px)"
                ></el-input>
                <i class="el-icon-phone-outline" style="margin-left: 5px"></i>
                <el-button
                  type="success"
                  style="
                    margin-left: 10px;
                    padding: 0px 8px;
                    width: 100px;
                    height: 28px;
                    vertical-align: top;
                  "
                >
                  <i class="el-icon-phone-outline"></i>
                  联系负责人
                </el-button>
              </el-form-item>
            </el-col>
          </el-row>
@@ -142,7 +154,7 @@
            </el-col>
            <el-col span="12">
              <el-form-item label="监控视频">
                <el-button type="primary" @click.stop="queryOldVideo(form)"
                <el-button type="success" @click.stop="queryOldVideo(form)"
                  >视频通话
                </el-button>
                <el-button type="primary" @click.stop="queryOldVideo(form)"
@@ -163,8 +175,10 @@
              </el-form-item>
            </el-col>
            <el-col span="12">
              <el-form-item label="备注">
                <el-input v-model="form.bz" autocomplete="off"></el-input>
              <el-form-item label="历史视频">
                <el-button type="primary" @click.stop="queryOldVideo(form)"
                  >查看视频
                </el-button>
              </el-form-item>
            </el-col>
          </el-row>
@@ -175,8 +189,16 @@
                <el-button type="success" @click.stop="revoke(form)"
                  >办结</el-button
                >
               <img src="/img/police-num.png" style="margin-top: -20px; height: 80px; vertical-align: middle;" alt="">
                >
                <img
                  src="/img/police-num.png"
                  style="
                    margin-top: -20px;
                    height: 80px;
                    vertical-align: middle;
                  "
                  alt=""
                />

                <el-button type="primary" @click.stop="generate(form)"
                  >派发保安</el-button
                >
@@ -251,10 +273,8 @@
          method: "post",
        }).then(function (response) {
          if (response.data.data.length > 0) {
            // that.deviceId = response.data.data[0].id;
            that.deviceId = 1;
            that.deviceId = response.data.data[0].id;
            that.form = response.data.data[0];

            that.dialogTableVisible = true;
            that.innerVisibleVideo = true;
            that.$refs.realAudio.src = "./realVideo/audio.mp3";
@@ -353,7 +373,7 @@
    },
    queryOldVideo(data) {
      var newAxios = axios.create({
        baseURL: "http://36.134.81.48:18000",
        baseURL: "https://web.byisf.com:18000",
        withCredentials: false,
        headers: {
          "Content-type": "application/x-www-form-urlencoded",
@@ -375,7 +395,7 @@
        .then((res) => {
          newAxios
            .get(
              `/GetPlayUrl?deviceCode=${data.channelNumber}&chl=${data.serialNumber}`
              `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${data.serialNumber}&chl=${data.channelNumber}`
            )
            .then((result) => {
              this.innerVisibleVideo = true;
@@ -584,7 +604,7 @@
  bottom: 0 !important;
  left: 0 !important;
  right: 400px !important;
  height: 630px !important;
  height: 558px !important;
  border-radius: 10px 10px 10px 10px;
}

@@ -605,7 +625,7 @@
  right: 0 !important;
  bottom: 0 !important;
  margin: auto !important;
  height: 630px;
  height: 558px;
}

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

 src/page/login/userlogin.vue

@@ -76,7 +76,7 @@
        tenantMode: this.website.tenantMode,
        loginForm: {
          //租户ID
          tenantId: "963841",
          tenantId: "000000",
          //用户名
          username: "",
          //密码

 src/views/distribution/index.vue

@@ -263,7 +263,7 @@
      }

      var newAxios = axios.create({
        baseURL: "http://web.byisf.com:18001",
        baseURL: "https://web.byisf.com:18001",
        withCredentials: false,
        headers: {},
      });
@@ -298,7 +298,7 @@

    getSelectOptions() {
      var newAxios = axios.create({
        baseURL: "http://web.byisf.com:18001",
        baseURL: "https://web.byisf.com:18001",
        withCredentials: false,
        headers: {},
      });
@@ -324,7 +324,7 @@
    },

    selectChange(value) {
      

      this.selectOptions.forEach((item) => {
        if (item.snumber == value) {
          this.form.handName = item.value;

 src/views/home/home.vue

@@ -1,6 +1,6 @@
<template>
  <iframe v-show="iframeState" id="show-iframe" frameborder=0 name="showHere" scrolling=auto
          src="http://web.byisf.com:18001/bigScreen/view/1349193280059879426"></iframe>
          src="https://web.byisf.com:18001/bigScreen/view/1349193280059879426"></iframe>
</template>

<script>

 src/views/policeTracking/policeTracking.vue

@@ -305,7 +305,7 @@
      <iframe
        id="mapDiv"
        ref="mapDiv"
        src="http://web.byisf.com:18001/map/index.html?openid=ClientManagement"
        src="https://web.byisf.com:18001/map/index.html?openid=ClientManagement"
        frameborder="0"
        width="100%"
        height="100%"
@@ -340,7 +340,7 @@
    , methods: {
      onSubmit() {
        var newAxios = axios.create({
          baseURL: "http://web.byisf.com:18001",
          baseURL: "https://web.byisf.com:18001",
          withCredentials: false,
          headers: {},
        });

 src/views/realTimePolice/real.vue

@@ -1,3 +1,9 @@
/*
 * @Author: Morpheus 
 * @Date: 2021-03-17 15:21:33 
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-03-17 16:44:50
 */
<template>
  <basic-container>
    <avue-crud
@@ -168,8 +174,16 @@
                autocomplete="off"
                style="width: calc(100% - 110px)"
              ></el-input>
              <el-button type="success"
              style="margin-left: 10px; padding: 0px 8px; width: 100px; height: 28px; vertical-align: top;">
              <el-button
                type="success"
                style="
                  margin-left: 10px;
                  padding: 0px 8px;
                  width: 100px;
                  height: 28px;
                  vertical-align: top;
                "
              >
                <i class="el-icon-phone-outline"></i>
                联系负责人
              </el-button>
@@ -270,8 +284,10 @@
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="备注">
              <el-input v-model="form.bz" autocomplete="off"></el-input>
            <el-form-item label="历史视频">
              <el-button type="primary" @click.stop="queryOldVideo(form)"
                >查看视频
              </el-button>
            </el-form-item>
          </el-col>
        </el-row>
@@ -288,10 +304,13 @@
              <el-button type="success" @click.stop="revoke(form)"
                >办结
              </el-button>
           

                <img src="/img/police-num.png" style="margin-top: -20px; height: 80px; vertical-align: middle;" alt="">
              
              <img
                src="/img/police-num.png"
                style="margin-top: -20px; height: 80px; vertical-align: middle"
                alt=""
              />

              <el-button type="primary" @click.stop="generate(form)"
                >派送保安
              </el-button>
@@ -323,6 +342,12 @@
import axios from "axios";

import Recorder from "js-audio-recorder";

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

export default {
  data() {
@@ -756,6 +781,11 @@
        currentData.getMinutes() < 10
          ? "0" + currentData.getMinutes()
          : currentData.getMinutes();
      //秒
      var currenS =
        currentData.getSeconds() < 10
          ? "0" + currentData.getSeconds()
          : currentData.getSeconds();

      return {
        week: {
@@ -786,6 +816,18 @@
            currenM +
            ":00",
        },
        current:
          currentY +
          "-" +
          currentM +
          "-" +
          currentD +
          " " +
          currenH +
          ":" +
          currenM +
          ":" +
          currenS,
      };
    },
    getBZdata(e) {
@@ -924,14 +966,34 @@
      }
    },
    revoke(row) {
      console.log(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);
      });

      newAddOper
        .post(
          "/blade-jfpts/operation/save",
          {},
          {
            params: {
              snumber: "001",
              sname: "李四",
              jid: "1",
              zc: "办结",
              zctime: that.getDate().current,
            },
          }
        )
        .then((res) => {
          console.log(res);
        });

      // 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;
@@ -1010,7 +1072,7 @@
    },
    queryOldVideo(data) {
      var newAxios = axios.create({
        baseURL: "http://36.134.81.48:18000",
        baseURL: "https://web.byisf.com:18000",
        withCredentials: false,
        headers: {
          "Content-type": "application/x-www-form-urlencoded",
@@ -1032,7 +1094,7 @@
        .then((res) => {
          newAxios
            .get(
              `/GetPlayUrl?deviceCode=${data.channelNumber}&chl=${data.serialNumber}`
              `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${data.serialNumber}&chl=${data.channelNumber}`
            )
            .then((result) => {
              this.innerVisibleVideo = true;
@@ -1098,7 +1160,7 @@
    },
    aKeyToCall(e, form) {
      var newCallAxios = axios.create({
        baseURL: "http://36.134.81.48:18000",
        baseURL: "https://web.byisf.com:18000",
        withCredentials: false,
        headers: {
          "Content-Type": "application/json;",