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

tangzy

2021-03-09 92005c9d1c4e6cb475c09639afc3c3c7c6cf968a

 src/views/realTimePolice/real.vue

@@ -347,7 +347,16 @@
              label: "警情类型",
              prop: "waringType",
              search: true,
              searchSpan: 3
              searchSpan: 3,
              className: "waringTypeClass",
              searchPlaceholder: "请选择",
              type: "select",
              props: {
                label: "dictValue",
                value: "dictValue"
              },
              //cascaderItem: ["city", "district"],
              dicUrl: "/api/blade-system/dict-biz/child-list?parentId=1356516807043231746",
            },
            {
              label: "报警时间",
@@ -361,8 +370,8 @@
              label: "报警时间",
              prop: "releaseTimeRange",
              type: "datetime",
              format: "yyyy-MM-dd HH:mm:ss",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              searchRange: true,
              searchSpan: 5,
              hide: true,
@@ -418,11 +427,12 @@
            {
              label: "生成警单",
              search: true,
              searchSpan: 3,
              searchSpan: 2,
              slot: true,
              searchPlaceholder: "",
              searchPlaceholder: " ",
              prop: "jtype",
              type: "select",
              className: "jtypeClass",
              dicData: [
                {
                  label: "否",
@@ -438,8 +448,8 @@
              label: "省份",
              prop: "province",
              search: true,
              searchSpan: 3,
              searchLabelWidth: 60,
              searchSpan: 2,
              searchLabelWidth: 45,
              placeholder: "省份",
              type: "select",
              props: {
@@ -493,6 +503,7 @@
        isActive: false,
        recorder: null
      };

    },
    computed: {
      ...mapGetters(["permission", "flowRoutes"]),
@@ -787,7 +798,7 @@
        });
        this.$store.state.tags.tagList = arr;
        this.$router.push({
          path: `/real/video/${row.channelNumber}/${row.serialNumber}`
          path: `/real/video/`,query:row
        });
      },
      handleHistory(row) {
@@ -852,6 +863,7 @@
                message: "生成警单成功",
                type: "success"
              });

              that.updateJtyep(row);
              that.dialogTableVisible = false;
              that.$router.push({ path: "/distribution/index", query: row });
@@ -1072,14 +1084,6 @@
                .getElementById("real_audio")
                .setAttribute("src", URL.createObjectURL(blob));

              console.log(
                blob,
                newbolb,
                fileOfBlob,
                window.URL.createObjectURL(blob),
                99999
              );

              this.recorder.play();

              newCallAxios
@@ -1110,11 +1114,43 @@
</script>

<style>
  .cityClass1 {
    padding-right: 5px !important;

  .el-card__body .jtypeClass{
    width: 10%;
  }

  .cityClass2 {
  .el-card__body .waringTypeClass{
    width: 12%;
  }

  /*页面样式*/
  .el-card__body .cityClass1 {
    width: 155px;
    padding-right: 0px !important;
  }
  .el-card__body .cityClass2 {
    width: 100px;
    padding-left: 0px !important;
    padding-right: 0px !important;
  }
  .el-card__body .cityClass3 {
    width: 100px;
    padding-left: 0px !important;
    padding-right: 0px !important;
  }

  /*新增窗体样式*/
  .el-dialog .cityClass1 {
    width: 220px;
    padding-right: 0px !important;
  }
  .el-dialog .cityClass2 {
    width: 110px;
    padding-left: 0px !important;
    padding-right: 0px !important;
  }
  .el-dialog .cityClass3 {
    width: 110px;
    padding-left: 0px !important;
    padding-right: 0px !important;
  }
@@ -1125,10 +1161,6 @@

  .cityClass3 div label {
    display: none;
  }

  .cityClass3 {
    padding-left: 5px !important;
  }

  .old-video-dialog {