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

liuyg

2021-04-25 dc2a04a6193f188e03c893ad2a14ead0240ec06c

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

 src/components/real-popup/main.vue

@@ -695,4 +695,7 @@
</script>

<style lang="scss">
.el-button.active {
  background: #ff0000 !important;
}
</style>

 src/views/clientManagement/clientManagement.vue

@@ -140,6 +140,7 @@
            </el-form-item>
          </el-col>
        </el-form>
        
      </el-dialog>


@@ -265,8 +266,8 @@
          height: 'auto',
          indexLabel: '序号',
          calcHeight: 80,
          labelWidth: '100',
          dialogWidth: 950,
          labelWidth: '125',
          dialogWidth: 960,
          menuWidth: 150,
          align:"center",
          size: "mini",
@@ -289,6 +290,11 @@
              searchPlaceholder: "设备名称/编号",
              search: true,
              sortable:true,
              rules: [{
                required: true,
                message: "请输入设备名称",
                trigger: "blur"
              }],
            },
            {
              label: "到期时间",
@@ -318,7 +324,7 @@
              width: 130,
              rules: [
                {
                  required: false,
                  required: true,
                  message: "请输入设备编号",
                  trigger: "click"
                }
@@ -330,17 +336,39 @@
              width: 200,
              type: "tree",
              dicUrl: "/api/blade-system/dept/trees",
              multiple: true,
              dicData: [],
              checkStrictly:true,
              props: {
                label: "title"
              },
              rules: [
                {
                  required: false,
                  required: true,
                  message: "请选择使用方",
                  trigger: "click"
                }
              ]
            },
            // {
            //   label: "使用方",
            //   prop: "deptId",
            //   width: 200,
            //   type: "cascader",
            //   dicUrl: "/api/blade-system/dept/trees",
            //   multiple: true,
            //   dicData: [],
            //   props: {
            //     label: "title"
            //   },
            //   rules: [
            //     {
            //       required: true,
            //       message: "请选择使用方",
            //       trigger: "click"
            //     }
            //   ]
            // },
            {
              label: "序列号",
              prop: "serialNumber",
@@ -348,6 +376,11 @@
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
              rules: [{
                required: true,
                message: "请输入序列号",
                trigger: "blur"
              }],
            },
            {
              label: "通道号",
@@ -356,6 +389,11 @@
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
              rules: [{
                required: true,
                message: "请输入通道号",
                trigger: "blur"
              }],
            }, {
              label: "缴费状态",
              prop: "jfzt",
@@ -408,7 +446,8 @@
              label: "省份",
              prop: "province",
              search: true,
              searchSpan: 3,
              searchSpan: 2,
              labelWidth: '112',
              searchLabelWidth: 45,
              placeholder: "省份",
              type: "select",
@@ -421,7 +460,6 @@
              span: 6,
              className: "city1",
              hide: true,
              // width: 10,
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
@@ -470,34 +508,92 @@
              editDisplay: true,
              viewDisplay: true,
            }, {
              label: "街道",
              label: "地址",
              prop: "street",
              width: 200,
              // type:"map",
              span:10,
              labelWidth: '142',
              width:100,
              hide: true,
            },
            {
              label: null,
              prop: "map",
              labelWidth: "0",
              searchSpan:0,
              maxlength:0,
              hide: true,
              span: 2,
              // display:false,
              component: "AvueMap"
            },
            {
              label: "经度",
              hide: true,
              prop: "jd",
              searchSpan:2,
              formatter: (row,value,label,column)=>{
                  return value = value.substring(0,11);
              },
              span:7,
            },
            {
              label: "纬度",
              labelWidth:50,
              hide: true,
              prop: "wd",
              formatter: (row,value,label,column) => {
                return value = value.substring(0,10);
              },
              span:5,
            },
             {
              label: "心跳时间",
              prop: "heartbeat",
              type: "datetime",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              width: 130,
              hide: true,
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
            },
            {
              label: "地址",
              prop: "map",
              hide: true,
              span: 24,
              component: "AvueMap",
            },
            {
              label: "经度",
              hide: true,
              prop: "jd",
            },
            {
              label: "纬度",
              hide: true,
              prop: "wd",
            },
            {
              label: "负责人",
              label: "负责人1",
              prop: "oneId",
              type: "tree",
              dicUrl: "/api/blade-system/dept/Batrees",
              props: {
                label: "title"
              },
              width: 72,
              hide: true,
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
              rules: [{
                required: true,
                message: "请选择负责人",
                trigger: "blur"
              }],
            },
            {
              label: "负责人1电话",
              prop: "onePhone",
              width: 110,
              hide: true,
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
              rules: [{
                required: true,
                message: "请输入负责人电话",
                trigger: "blur"
              }],
            }, {
              label: "负责人2",
              prop: "twoId",
              type: "tree",
              dicUrl: "/api/blade-system/dept/Batrees",
              props: {
@@ -510,8 +606,30 @@
              viewDisplay: true,
            },
            {
              label: "负责人电话",
              prop: "onePhone",
              label: "负责人2电话",
              prop: "twoPhone",
              width: 110,
              hide: true,
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
            }, {
              label: "负责人3",
              prop: "threeId",
              type: "tree",
              dicUrl: "/api/blade-system/dept/Batrees",
              props: {
                label: "title"
              },
              width: 72,
              hide: true,
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
            },
            {
              label: "负责人3电话",
              prop: "threePhone",
              width: 110,
              hide: true,
              addDisplay: true,
@@ -546,17 +664,6 @@
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
            }, {
              label: "心跳时间",
              prop: "heartbeat",
              type: "datetime",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              width: 130,
              hide: true,
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
            },

          ]
@@ -568,11 +675,23 @@
      "form.map": {
        // form是表单或者表格绑定的数据集，v-model='form'
        handler(val) {

          if (val) {
            this.form.wd = val.latitude;
            this.form.jd = val.longitude;
            this.form.street = val.formattedAddress;
            console.log(val,111);
            this.form.wd = val.latitude.toString().substring(0,10);
            this.form.jd = val.longitude.toString().substring(0,11);
            //地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
            var address = val.formattedAddress.toString();
            if(address.search("县") != -1){
                this.form.street = address.substring(address.indexOf("县")+1,address.length);
            }
            if(address.search("区") != -1){
              this.form.street = address.substring(address.indexOf("区")+1,address.length);
            }

            // this.form.province = val.addressComponent.province;
            // console.log( val.addressComponent.city,123456)
            // this.form.city = val.addressComponent.city;
            // this.form.district = val.addressComponent.district;
          }
        },
        immediate: true,
@@ -589,7 +708,34 @@
            });
          }
        },
      },
      "form.twoId":{
        handler(val) {
          var that = this;
          if (val != null && val !=""){
            getBaTree(val).then(res => {
              if (res) {
                that.form.twoPhone = res.data.data.records[0].phone;
                that.form.twoContacts = res.data.data.records[0].name;
              }
            });
          }
        },
      },
      "form.threeId":{
        handler(val) {
          var that = this;
          if (val != null && val !=""){
            getBaTree(val).then(res => {
              if (res) {
                that.form.threePhone = res.data.data.records[0].phone;
                that.form.threeContacts = res.data.data.records[0].name;
              }
            });
          }
        },
      }
      
    },
    computed: {
      ...mapGetters(["permission"]),
@@ -623,6 +769,7 @@
          window.console.log(error);
        });
      },
      
      handleClick(row) {
        this.form = row;
        this.dialogTableVisible = true;
@@ -648,6 +795,9 @@
        });
      },
      rowUpdate(row, index, done, loading) {
        debugger;
        row.jd=row.map.latitude;
        row.wd=row.map.longitude;
        update(row).then(() => {
          this.onLoad(this.page);
          this.$message({
@@ -765,6 +915,7 @@

        this.loading = true;
        getList(page.currentPage, page.pageSize, values, this.treeDeptId).then(res => {
          debugger;
          const data = res.data.data;
          this.page.total = data.total;

@@ -1017,4 +1168,21 @@
    padding-right: 5px;
  }



</style>


<style>
  .avue-map input{
    position: relative !important;
    left: 30px !important;
  }

  .avue-map .el-input-group__append{
    position: relative !important;
    left: -51px !important;
  }


</style>

 src/views/policeTracking/policeTracking.vue

@@ -167,7 +167,6 @@
          </el-card>

          <div
            v-if="form.jtype != 2"
            style="margin-top: 20px"
            role="tab"
            aria-expanded="true"
@@ -191,15 +190,15 @@
                  "
                  size="small"
                  style="position: absolute; right: 0"
                  :disabled="!flag"
                  :type="!flag ? 'info' : 'danger'"
                  :disabled="form.securityArr.length > 0"
                  :type="form.securityArr.length > 0 ? 'info' : 'danger'"
                  >通 知</el-button
                >
              </div>
            </div>
          </div>

          <el-card v-if="form.jtype != 2">
          <el-card>
            <el-table
              ref="multipleTable"
              :data="tableData"
@@ -209,7 +208,7 @@
              max-height="240"
            >
              <el-table-column
                v-if="flag"
                v-if="!(form.securityArr.length > 0)"
                type="selection"
                width="55"
                align="center"
@@ -250,10 +249,20 @@
                align="center"
              >
              </el-table-column>

              <el-table-column
                v-if="form.securityArr.length > 0"
                prop="status"
                label="通知状态"
                width="120"
                align="center"
              >
              </el-table-column>
              <el-table-column
                v-else
                prop="roleName"
                label="所属角色"
                width="100"
                width="120"
                align="center"
              >
              </el-table-column>
@@ -404,7 +413,7 @@
            <el-input
              disabled="true"
              type="textarea"
              v-model="security.describe"
              v-model="security.result"
              autocomplete="off"
            ></el-input>
          </el-card>
@@ -467,17 +476,6 @@
            ></video>
            <span v-show="feedbackVideo == ''">暂无现场视频</span>
          </el-card>

          <el-row :align="center" style="margin-top: 40px">
            <el-col :offset="10">
              <el-button
                @click="onSubmit('处理完成', 2)"
                :disabled="form.jtype == 2 ? true : false"
                :type="form.jtype == 2 ? 'info' : 'danger'"
                >处理完成</el-button
              >
            </el-col>
          </el-row>
        </el-card>
      </div>
    </el-col>
@@ -789,33 +787,64 @@
          that.tableData = [];
          var i = 0;

          res.data.data.records.forEach((item) => {
            if (item.id == that.form.oneId) {
              that.tableData.push({
                id: item.id,
                ind: (i += 1),
                name: item.name,
                phone: item.phone,
                online_status: item.online_status == 1 ? "在线" : "掉线",
                roleName: item.roleName + "(负责人)",
                tenantName: item.tenantName,
              });
            }
          });
          if (that.form.securityArr.length > 0) {
            res.data.data.records.forEach((item) => {

          res.data.data.records.forEach((item) => {
            if (item.roleName == "处警员" && item.id != that.form.oneId) {
              that.tableData.push({
                id: item.id,
                ind: (i += 1),
                name: item.name,
                phone: item.phone,
                online_status: item.online_status == 1 ? "在线" : "掉线",
                roleName: item.roleName,
                tenantName: item.tenantName,
              });
            }
          });
              if (item.id == that.form.securityId) {
                that.tableData.push({
                  id: item.id,
                  ind: (i += 1),
                  name: item.name,
                  phone: item.phone,
                  online_status: item.online_status == 1 ? "在线" : "掉线",
                  status: "接警人(已通知)",
                  tenantName: item.tenantName,
                });
              }
            });

            res.data.data.records.forEach((item) => {
              if (that.form.securityArr.indexOf(item.id) != -1 && item.id != that.form.securityId) {
                that.tableData.push({
                  id: item.id,
                  ind: (i += 1),
                  name: item.name,
                  phone: item.phone,
                  online_status: item.online_status == 1 ? "在线" : "掉线",
                   status: "已通知",
                  tenantName: item.tenantName,
                });
              }
            });
          } else {
            res.data.data.records.forEach((item) => {
              if (item.id == that.form.oneId) {
                that.tableData.push({
                  id: item.id,
                  ind: (i += 1),
                  name: item.name,
                  phone: item.phone,
                  online_status: item.online_status == 1 ? "在线" : "掉线",
                  roleName: item.roleName + "(负责人)",
                  tenantName: item.tenantName,
                });
              }
            });

            res.data.data.records.forEach((item) => {
              if (item.roleName == "处警员" && item.id != that.form.oneId) {
                that.tableData.push({
                  id: item.id,
                  ind: (i += 1),
                  name: item.name,
                  phone: item.phone,
                  online_status: item.online_status == 1 ? "在线" : "掉线",
                  roleName: item.roleName,
                  tenantName: item.tenantName,
                });
              }
            });
          }
        });
    },


 src/views/realTimePolice/real.vue

@@ -73,7 +73,7 @@
        </el-button>
        <el-button
          type="warning"
          size="small"
          size="mini"
          plain
          icon="el-icon-pie-chart"
          @click="handleExportStatis"
@@ -136,268 +136,7 @@
        </el-button>
      </template>
    </avue-crud>

    <el-dialog
      class="real-dialog"
      title="警情核实"
      :visible.sync="dialogTableVisible"
      :append-to-body="true"
      :close-on-click-modal="false"
      @opened="realOpenVideoDialog"
      @close="(videoConversationReal = false), (oldVideoSatart = false)"
    >
      <el-dialog
        class="ss-video-dialog"
        :modal="false"
        width="100%"
        title="视频通话"
        :visible.sync="videoConversationReal"
        :close-on-press-escape="false"
        append-to-body
        @opened="openRealVideoBox"
        @close="closeRealVideoBox"
      >
        <video
          src=""
          id="real_video_conversation"
          style="width: 100%; height: 100%; object-fit: fill"
          controls
        ></video>
      </el-dialog>

      <el-dialog
        class="ss-video-dialog"
        :modal="false"
        width="100%"
        title="历史回放"
        :visible.sync="oldVideoSatart"
        :close-on-press-escape="false"
        append-to-body
        @opened="openOldVideoBox"
        @close="closeOldVideoBox"
      >
        <video
          src="/oldVideo/ft.mp4"
          muted="muted"
          autoplay="autoplay"
          loop
          id="real_old_video"
          style="width: 100%; height: 100%; object-fit: fill"
          controls
        ></video>
      </el-dialog>

      <el-form
        :model="form"
        label-position="right"
        size="mini"
        label-width="100px"
      >
        <el-row>
          <el-col span="12">
            <audio src="" id="real_audio"></audio>
            <el-form-item label="报警人">
              <el-input
                disabled="true"
                v-model="form.galarmPeople"
                autocomplete="off"
              ></el-input>
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="报警人电话">
              <el-input
                disabled="true"
                v-model="form.phoneNumber"
                autocomplete="off"
              ></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col span="12">
            <el-form-item label="负责人">
              <el-select
                v-model="peopleName"
                placeholder="请选择"
                @change="peopleOrPhone"
                style="width: 100%"
              >
                <el-option
                  v-for="item in peopleList"
                  :key="item.value"
                  :label="item.label"
                  :value="item.label"
                >
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="负责人电话">
              <el-input
                disabled="true"
                v-model="peoplePhone"
                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;
                "
              >
                <i class="el-icon-phone-outline"></i>
                联系负责人
              </el-button>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col span="12">
            <el-form-item label="省份" class="cityClassParams">
              <avue-form :option="itemOption" v-model="form"></avue-form>
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="事发地址">
              <el-input
                disabled="true"
                v-model="form.place"
                autocomplete="off"
              ></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col span="12">
            <el-form-item label="警情类型">
              <el-input
                disabled="true"
                v-model="form.waringType"
                autocomplete="off"
              ></el-input>
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="设备编号">
              <el-input
                disabled="true"
                v-model="form.deviceNumber"
                autocomplete="off"
              ></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col span="12">
            <el-form-item label="接警人">
              <el-input
                disabled="true"
                v-model="form.alarmPeople"
                autocomplete="off"
              ></el-input>
            </el-form-item>
          </el-col>
          <!-- <el-col span="12">
            <el-form-item label="接警时间">
              <el-input
                disabled="true"
                v-model="form.jjTime"
                autocomplete="off"
              ></el-input>
            </el-form-item>
          </el-col> -->
          <el-col span="12">
            <el-form-item label="报警内容">
              <el-input
                disabled="true"
                v-model="form.content"
                autocomplete="off"
              ></el-input>
            </el-form-item>
          </el-col>
        </el-row>

        <el-row>
          <el-col span="12">
            <el-form-item label="报警时间">
              <el-input
                disabled="true"
                v-model="form.alarmTime"
                autocomplete="off"
              ></el-input>
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="监控视频">
              <el-button
                :class="{ active: isActive }"
                type="success"
                @click.stop="
                  (videoConversationReal = true), (oldVideoSatart = false)
                "
                @mousedown.native="aKeyToCall"
                @mouseup.native="aKeyStopCall"
                >视频通话
              </el-button>
              <el-button
                v-show="false"
                type="primary"
                @click.stop="
                  (oldVideoSatart = true), (videoConversationReal = false)
                "
                >查看历史
              </el-button>
            </el-form-item>
          </el-col>
        </el-row>

        <el-row>
          <el-col span="12">
            <el-form-item label="备注">
              <el-input v-model="form.bz" autocomplete="off"></el-input>
            </el-form-item>
          </el-col>
        </el-row>

        <el-row :align="center">
          <el-col class="opt-btn">
            <el-form-item>
              <!-- <el-button
                :class="{ active: isActive }"
                type="success"
                @click.stop="aKeyToCall($event, form)"
                >查看视频
              </el-button> -->
              <el-button
                type="success"
                @click.stop="updateJtyep(form, 1, '办结')"
                >办结
              </el-button>

              <img
                src="/img/police-num.png"
                style="margin-top: -20px; height: 80px; vertical-align: middle"
                alt=""
                @click.stop="updateJtyep(form, 1, '推送110')"
              />

              <el-button
                type="primary"
                @click.stop="updateJtyep(form, 1, '派送保安')"
                >派送保安
              </el-button>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
    </el-dialog>

    <real-popup ref="realPopupView"> </real-popup>
    <el-drawer title="电子地图" append-to-body="true" :visible.sync="showMap">
      <iframe
        id="mapDiv"
@@ -415,21 +154,12 @@
import { getList, remove, update, add, getclient } from "@/api/real/real";
import { mapGetters } from "vuex";

import Hls from "hls.js";

import axios from "axios";

import Recorder from "js-audio-recorder";

export default {
  data() {
    return {
      showMap: false,
      hls: "",
      videoSource: "",
      dialogTableVisible: false,
      videoConversationReal: false,
      oldVideoSatart: false,
      activeClass: 3,
      form: {},
      query: {},
@@ -646,63 +376,9 @@
          },
        ],
      },
      itemOption: {
        menuBtn: false,
        column: [
          {
            disabled: true,
            row: false,
            prop: "province",
            type: "select",
            placeholder: "省份",
            props: {
              label: "name",
              value: "code",
            },
            cascaderItem: ["city", "district"],
            dicUrl: "/api/blade-system/region/select",
            span: 1,
            labelWidth: "0",
            className: "cityClassSelect",
          },
          {
            disabled: true,
            row: false,
            prop: "city",
            type: "select",
            placeholder: "地市",
            props: {
              label: "name",
              value: "code",
            },
            dicUrl: "/api/blade-system/region/select?code={{key}}",
            span: 1,
            labelWidth: "0",
            className: "cityClassSelect",
          },
          {
            disabled: true,
            row: false,
            prop: "district",
            type: "select",
            placeholder: "区县",
            props: {
              label: "name",
              value: "code",
            },
            dicUrl: "/api/blade-system/region/select?code={{key}}",
            span: 1,
            labelWidth: "0",
            className: "cityClassSelect",
          },
        ],
      },
      data: [],
      isActive: false,
      recorder: null,
      peopleList: [],
      peopleName: "",
      peoplePhone: "",
    };
  },
  computed: {
@@ -1149,54 +825,9 @@
      return "";
    },
    handleManage(row) {
      this.form = row;
      this.peopleList = [
        { label: row.oneContacts, value: row.onePhone },
        { label: row.twoContacts, value: row.twoPhone },
        { label: row.threeContacts, value: row.threePhone },
      ];
      this.peopleName = row.oneContacts;
      this.peoplePhone = row.onePhone;
      this.dialogTableVisible = true;
      this.$refs.realPopupView.onItemGetParentData(row);
    },
    updateJtyep(row, jtype, t) {
      var that = this;

      axios
        .post(
          "/api/blade-jfpts/alarm/alarm/updateJtype",
          {},
          {
            params: {
              jid: row.id,
              jtype: jtype,
              rid: row.alarmId,
              bz: row.bz,
              snumber: row.alarmId,
              sname: row.alarmPeople,
              zc: t,
              zctime: that.getDate().current,
            },
          }
        )
        .then(function () {
          that.dialogTableVisible = false;

          axios({
            method: "post",
            url: `/api/blade-jfpts/rvideo/stop`,
            params: {
              jid: row.id,
            },
          }).then((resdata) => {});

          that.onLoad(that.page, that.query);
          that.$router.push({
            path: "/policeTracking/track",
            query: that.form,
          });
        });
    },
    beginTimeOrEndTime(time) {
      var beginTime = new Date(time);

@@ -1256,215 +887,12 @@
        end: endY + endM + endD + endH + endm + ends,
      };
    },
    // 视频通话打开关闭事件
    openRealVideoBox() {
      var that = this;
      var newAxios = axios.create({
        baseURL: "https://web.byisf.com:18000",
        withCredentials: false,
        headers: {
          "Content-type": "application/x-www-form-urlencoded",
        },
      });

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

              if (Hls.isSupported()) {
                var dom = document.getElementById("real_video_conversation");

                that.hls = new Hls();

                var m3u8Url = decodeURIComponent(that.videoSource);

                that.hls.loadSource(m3u8Url);

                that.hls.attachMedia(dom);

                that.hls.on(Hls.Events.MANIFEST_PARSED, function () {
                  dom.play();
                });

                that.hls.on(Hls.Events.ERROR, function (event, data) {
                  console.log(data, 4566824159, "视频播放有问题！！！");
                  if (data.fatal) {
                    switch (data.type) {
                      case Hls.ErrorTypes.NETWORK_ERROR:
                        // try to recover network error
                        console.log(
                          "fatal network error encountered, try to recover"
                        );
                        that.hls.startLoad();
                        break;
                      case Hls.ErrorTypes.MEDIA_ERROR:
                        console.log(
                          "fatal media error encountered, try to recover"
                        );
                        that.hls.recoverMediaError();
                        break;
                      default:
                        // cannot recover
                        that.hls.destroy();
                        break;
                    }
                  }
                });
              }
            });
        });
    },
    closeRealVideoBox() {
      var dom = document.getElementById("real_video_conversation");

      if (dom.getAttribute("src") != "") {
        dom.pause();

        dom.setAttribute("src", "");

        this.hls.destroy();
      }
    },
    // 历史视频打开关闭事件
    openOldVideoBox() {
      var dom = document.getElementById("real_old_video");
      dom.currentTime = 0;
      dom.play();
    },
    closeOldVideoBox() {
      var dom = document.getElementById("real_old_video");
      dom.pause();
    },

    aKeyToCall() {
      this.isActive = true;
      var that = this;
      if (this.recorder == null) {
        this.recorder = new Recorder({
          sampleBits: 16, // 采样位数，支持 8 或 16，默认是16
          sampleRate: 8000, // 采样率，支持 11025、16000、22050、24000、44100、48000，根据浏览器默认值，我的chrome是48000
          numChannels: 1, // 声道，支持 1 或 2， 默认是1
          // compiling: false,(0.x版本中生效,1.x增加中)  // 是否边录边转换，默认是false
        });
      }

      // 一键呼叫相关函数
      that.recorder.start().then(
        () => {
          // 开始录音
        },
        (error) => {
          // 出错了
          console.log(`${error.name} : ${error.message}`);
        }
      );
    },

    // 序列号后期待修改
    aKeyStopCall() {
      this.isActive = false;
      var newCallAxios = axios.create({
        baseURL: "https://web.byisf.com:18000",
        withCredentials: false,
        headers: {
          "Content-Type": "application/json;",
        },
      });

      var that = this;

      newCallAxios
        .post(
          `/api_control`,
          {},
          {
            params: {
              param: { PktType: "GetAccessToken" },
            },
          }
        )
        .then((result) => {
          var formData = new FormData();
          // that.recorder.downloadWAV("新文件");

          var blob = that.recorder.getPCMBlob(); //获取pcm格式音频数据
          //此处获取到blob对象后需要设置fileName满足当前项目上传需求，其它项目可直接传把blob作为file塞入formData
          var newbolb = new Blob([blob], { type: "audio/pcm" });
          var fileOfBlob = new File([newbolb], new Date().getTime() + ".pcm");
          formData.append("file", fileOfBlob);

          var wavBlob = that.recorder.getWAVBlob();

          var wavformData = new FormData();
          var wavform = new File([wavBlob], new Date().getTime() + ".wav");
          wavformData.append("file", wavform);
          console.log(
            wavBlob,
            wavform,
            wavformData,
            wavformData.entries(),
            132
          );

          axios({
            method: "post",
            url: "/api/blade-jfpts/xlfeedback/xlfeedback/put-objecty",
            data: wavformData,
            params: {
              jid: that.form.id,
            },
          }).then((resdata) => {
            console.log(resdata);
          });

          newCallAxios
            .post(`/api_control`, blob, {
              params: {
                param: {
                  PktType: "Talk",
                  accessToken: result.data.data.accessToken,
                  deviceCode: this.form.serialNumber,
                },
              },
            })
            .then(() => {
              that.recorder.destroy().then(function () {
                that.recorder = null;
              });
            });
        });
    },

    peopleOrPhone(e) {
      this.peopleList.forEach((item) => {
        if (item.label == e) {
          this.peoplePhone = item.value;
        }
      });
    },
    PoliceTracking(row) {
      //警情追踪
      this.$router.push({ path: "/policeTracking/track", query: row });
    },
    realOpenVideoDialog() {
      Recorder.getPermission().then(() => {});
      this.videoConversationReal = true;
    },

    //数据导出
    handleExport() {
      this.$confirm("是否导出实时警情数据?", "提示", {
@@ -1479,27 +907,25 @@
    },
    //数据报表导出
    handleExportStatis() {
        let beginTime =
          this.$route.query.startTime == undefined
            ? ""
            : this.$route.query.startTime;
        let endTime =
          this.$route.query.endTime == undefined
            ? ""
            : this.$route.query.endTime;
        let waringType =
          this.$route.query.waringType == undefined
            ? ""
            : this.$route.query.waringType;
        let timeDesc =
          this.$route.query.timeDesc == undefined
            ? ""
            : this.$route.query.timeDesc;
        window.open(
          `https://web.byisf.com/api/blade-report/ureport/preview?_u=blade-alarm.statis.ureport.xml&beginTime=${beginTime}&endTime=${endTime}&waringType=${waringType}&timeDesc=${timeDesc}`
        );
        //window.open(`http://localhost:8108/ureport/excel?_u=blade-alarm.statis.ureport.xml&beginTime=${beginTime}&endTime=${endTime}&waringType=${waringType}&timeDesc=${timeDesc}`);
    }
      let beginTime =
        this.$route.query.startTime == undefined
          ? ""
          : this.$route.query.startTime;
      let endTime =
        this.$route.query.endTime == undefined ? "" : this.$route.query.endTime;
      let waringType =
        this.$route.query.waringType == undefined
          ? ""
          : this.$route.query.waringType;
      let timeDesc =
        this.$route.query.timeDesc == undefined
          ? ""
          : this.$route.query.timeDesc;
      window.open(
        `https://web.byisf.com/api/blade-report/ureport/preview?_u=blade-alarm.statis.ureport.xml&beginTime=${beginTime}&endTime=${endTime}&waringType=${waringType}&timeDesc=${timeDesc}`
      );
      //window.open(`http://localhost:8108/ureport/excel?_u=blade-alarm.statis.ureport.xml&beginTime=${beginTime}&endTime=${endTime}&waringType=${waringType}&timeDesc=${timeDesc}`);
    },
  },
};
</script>
@@ -1509,10 +935,9 @@
  width: 12%;
}


.cityreal2 div label,.cityreal3 div label {
.cityreal2 div label,
.cityreal3 div label {
  display: none;
  
}

/*页面样式*/
@@ -1609,10 +1034,6 @@
.old-video-dialog .el-dialog .el-dialog__body {
  height: calc(100% - 54px);
  box-sizing: border-box;
}

.el-button.active {
  background: #ff0000 !important;
}

.el-button.btn-color {

 src/views/system/cs.vue

@@ -366,17 +366,6 @@
                        ],
                      },
                      {
                        label: "地址",
                        prop: "had",
                        rules: [
                          {
                            required: true,
                            message: "请输入地址",
                            trigger: "blur",
                          },
                        ],
                      },
                      {
                        label: "介绍",
                        prop: "content",
                        rules: [
@@ -440,16 +429,6 @@
                        ],
                      },
                      {
                        label: "地址",
                        prop: "had",
                        rules: [
                          {
                            required: true,
                            message: "请输入地址",
                          },
                        ],
                      },
                      {
                        label: "介绍",
                        prop: "content",
                        span: 24,
@@ -463,7 +442,8 @@
                    ],
                  },
                ];
              } else if (value.value == "2") {
              }
              else if (value.value == "2") {
                that.option.group = [
                  {
                    label: "详细信息",
@@ -503,16 +483,6 @@
                          {
                            required: true,
                            message: "请输入开发商",
                          },
                        ],
                      },
                      {
                        label: "地址",
                        prop: "had",
                        rules: [
                          {
                            required: true,
                            message: "请输入地址",
                          },
                        ],
                      },
@@ -616,7 +586,6 @@
  watch: {
    "form.map": {
      // form是表单或者表格绑定的数据集，v-model='form'

      handler(val) {
        if (val) {
          this.form.wd = val.latitude;
@@ -652,9 +621,10 @@
      add(row).then(
        () => {
          if (row.type == "0") {
            console.log(123)
            instery(
              row.dj,
              row.had,
             // row.had,
              row.ht,
              row.ctime,
              row.content,
@@ -664,7 +634,7 @@
            insertss(
              row.dj,
              row.nature,
              row.had,
             // row.had,
              row.motto,
              row.ctime,
              row.content,
@@ -676,7 +646,7 @@
              row.category,
              row.attributes,
              row.developers,
              row.had,
             // row.had,
              row.housetype,
              row.content,
              row.hn
@@ -777,17 +747,18 @@
              data.dj = re.data.data[0].dj;
              data.motto = re.data.data[0].motto;
              data.ctime = re.data.data[0].ctime;
              data.had = re.data.data[0].had;
              //data.had = re.data.data[0].had;
              data.content = re.data.data[0].content;
              this.form = data;
            });
          } else if (this.form.type == "0") {
            selectTy(this.form.tenantName).then((re) => {
              console.log(re ,123)
              const data = res.data.data;
              data.dj = re.data.data[0].dj;
              data.ht = re.data.data[0].ht;
              data.ctime = re.data.data[0].ctime;
              data.had = re.data.data[0].had;
              //.had = re.data.data[0].had;
              data.content = re.data.data[0].content;
              this.form = data;
            });
@@ -798,7 +769,7 @@
              data.category = re.data.data[0].category;
              data.attributes = re.data.data[0].attributes;
              data.developers = re.data.data[0].developers;
              data.had = re.data.data[0].had;
              //data.had = re.data.data[0].had;
              data.housetype = re.data.data[0].housetype;
              data.content = re.data.data[0].content;
              this.form = data;
@@ -813,7 +784,7 @@
              data.nature = re.data.data[0].nature;
              data.motto = re.data.data[0].motto;
              data.ctime = re.data.data[0].ctime;
              data.had = re.data.data[0].had;
              //data.had = re.data.data[0].had;
              data.content = re.data.data[0].content;
              if (!(data.accountNumber > 0)) {
                data.accountNumber = "不限制";
@@ -829,7 +800,7 @@
              data.dj = re.data.data[0].dj;
              data.ht = re.data.data[0].ht;
              data.ctime = re.data.data[0].ctime;
              data.had = re.data.data[0].had;
              //data.had = re.data.data[0].had;
              data.content = re.data.data[0].content;
              if (!(data.accountNumber > 0)) {
                data.accountNumber = "不限制";
@@ -845,7 +816,7 @@
              data.category = re.data.data[0].category;
              data.attributes = re.data.data[0].attributes;
              data.developers = re.data.data[0].developers;
              data.had = re.data.data[0].had;
              //data.had = re.data.data[0].had;
              data.housetype = re.data.data[0].housetype;
              data.content = re.data.data[0].content;
              if (!(data.accountNumber > 0)) {