Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

tangzy

2021-06-29 6de8b8a3e3790b874045d20b77bb7aa71dcdfb37

 src/views/policeTracking/policeTracking.vue

@@ -43,7 +43,7 @@
                  <el-form-item label="警情类型">
                    <el-input
                      disabled="true"
                      v-model="form.waringType"
                      v-model="form.alarmType"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item>
@@ -144,7 +144,7 @@
                  <el-form-item label="人员编号">
                    <el-input
                      disabled="true"
                      v-model="form.baname"
                      v-model="form.baid"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item>
@@ -153,7 +153,7 @@
                  <el-form-item label="人员名称">
                    <el-input
                      disabled="true"
                      v-model="form.baid"
                      v-model="form.baname"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item>
@@ -375,7 +375,7 @@
              multiple: true,
              leafOnly: "",
              span: 24,
              dicUrl: "/api/blade-jfpts/catalogs/catalogs/getBigTree",
              dicUrl: "/api/catalogs/catalogs/getBigTree",
              props: {
                label: "title"
              },
@@ -549,6 +549,10 @@
      onSubmit() {
        var that = this;

        var userId = JSON.parse(
          window.localStorage.getItem("群防群控后台管理系统-userInfo")
        ).content.real_name;

        if (that.form.securityArr != null && that.form.securityArr != ""){
          that.form.jtype = "1";
          if (typeof that.form.securityArr != "string"){
@@ -559,8 +563,17 @@
            that.form.securityArr = security.substring(0, security.length - 1);
          }

          if (that.form.securityArr == "" || that.form.securityArr == null) {
            that.form.jtype = "0";
            that.form.alarmPeople = "";
          }else {
            that.form.jtype = "1";
            //已派发保安
            that.form.alarmPeople = userId;
          }

          axios({
            url: '/api/blade-jfpts/alarm/alarm/submit',
            url: '/api/alarm/alarm/submit',
            method: 'post',
            data: that.form
          }).then((resdata) => {
@@ -583,7 +596,7 @@

      getReceivingAlarm() {
        axios
          .get(`/api/blade-jfpts/operation/list?jid=${this.form.id}`)
          .get(`/api/operation/list?jid=${this.form.id}`)
          .then((res) => {
            this.receivingList = res.data.data.records;
          });
@@ -624,7 +637,7 @@
      getAudios() {
        axios({
          method: "get",
          url: "/api/blade-jfpts/avideo/list",
          url: "/api/avideo/list",
          params: {
            jid: this.form.id,
          },
@@ -636,7 +649,7 @@
      getImgAndVideo() {
        axios({
          method: "post",
          url: "/api/blade-jfpts/feedback/feedback/selectFeedEdit",
          url: "/api/feedback/feedback/selectFeedEdit",
          params: {
            jid: this.form.id,
          },
@@ -668,7 +681,7 @@
        var that = this;
        axios({
          method: "get",
          url: "/api/blade-jfpts/alarm/alarm/page",
          url: "/api/alarm/alarm/page",
          params: {
            id: that.form.id,
          },