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

Administrator

2021-03-21 60e5202efdc7a91315d2620f505de1b7111cc7b7

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

 public/map/widgets/aPoliceTeam/APoliceTeam.js

Diff too large

 public/map/widgets/analysisAndJudgment/AnalysisAndJudgment.js

@@ -684,22 +684,19 @@
            dom.empty();
            var that = this;
            $.ajax({
                url: 'https://web.byisf.com:18001/api/blade-jfpts/jingdan/jingdan/selectList',
                type: 'POST',
                url: "https://web.byisf.com:18001/api/blade-jfpts/alarm/alarm/page?current=1&size=99999&waringType=&beginTime=" + beginTime + "&endTime=" +endTime +"&province=36&city=3601&district=" + addvcd,
                type: 'get',
                dataType: 'JSON',
                data: {
                    beginTime: beginTime,
                    endTime: endTime,
                    waringType: waringType,
                    district: addvcd,
                    type: ''
                },
                success: function (data) {
                    var result = data.data;
                    var result = data.data.records;
                    var str = '';
                    that.entitysData = [];
                    that.analysisAddEntitys.clear();
                    for (var a, time, t, e, y, h, i = 0; i < result.length; i++) {

                        if (result[i].waringType == "紧急求救") {
                            result[i].waringType = "一键求助"
                        }

                        that.createEntitysAnalysis(that.analysisAddEntitys, that.entitysData, '警情信息', {
                            lgtd: result[i].jd,
@@ -707,17 +704,16 @@
                            id: result[i].id
                        }, result[i].jd, result[i].wd, './images/police-situation.png');


                        t = result[i].galarmTime.substr(0, 10);
                        e = result[i].galarmTime.substr(11);
                        t = result[i].alarmTime.substr(0, 10);
                        e = result[i].alarmTime.substr(11);
                        time = t + '&nbsp;' + e;
                        y = result[i].galarmTime.substr(5, 5);
                        h = result[i].galarmTime.substr(11, 5);
                        y = result[i].alarmTime.substr(5, 5);
                        h = result[i].alarmTime.substr(11, 5);
                        a = Number(i) + 1;
                        str += '<tr term-list=' + result[i].id + '>';
                        str += '<td>' + a + '</td>';
                        str += '<td title=' + result[i].waringType + '>' + result[i].waringType + '</td>';
                        str += '<td title=' + result[i].addvnm + '>' + result[i].addvnm + '</td>';
                        str += '<td title=' + result[i].alarmPeople + '>' + result[i].alarmPeople + '</td>';
                        str += "<td><a href='javascript:;' title=" + time + ">" + y + ' ' + h + "</a></td>";
                        str += "<td class='location'> <input type='button' value='定位'" + ' lgtd=' + result[i].jd + ' lttd=' + result[i].wd + "></td>";
                        str += '</tr>';

 public/map/widgets/analysisAndJudgment/AnalysisAndJudgment1.css

File was deleted

 public/map/widgets/analysisAndJudgment/AnalysisAndJudgment1.js

File was deleted

 public/map/widgets/analysisAndJudgment/template.html

@@ -21,14 +21,7 @@
                        <div class='select-list'>
                            <ul>
                                <li>全部</li>
                                <li>医疗求助</li>
                                <li>火警</li>
                                <li>紧急求救</li>
                                <li>盗警</li>
                                <li>普通报警</li>
                                <li>交通</li>
                                <li>中心调度</li>
                                <li>电话报警</li>
                                <li>一键求助</li>
                            </ul>
                        </div>
                    </li>
@@ -62,7 +55,7 @@
                                <tr>
                                    <th>序号</th>
                                    <th>类别</th>
                                    <th>行政区</th>
                                    <th>接警员</th>
                                    <th>日期</th>
                                    <th>操作</th>
                                </tr>

 public/map/widgets/analysisAndJudgment/template1.html

File was deleted

 src/page/index/logo.vue

@@ -376,7 +376,6 @@

          if (response.data.data.length > 0) {
            that.deviceId = response.data.data[0].id;
            console.log(userId, response.data.data[0].alarmId);
            if (
              response.data.data[0].waringType == "紧急求救" &&
              response.data.data[0].alarmId == userId
@@ -682,7 +681,6 @@
      that.recorder.start().then(
        () => {
          // 开始录音
          console.log(111);
        },
        (error) => {
          // 出错了

 src/views/home/home.vue

@@ -7,22 +7,49 @@
 * @LastEditTime: 2021-03-18 10:37:42
-->
<template>
  <iframe v-show="iframeState" id="show-iframe" frameborder=0 name="showHere" scrolling=auto
          src="https://web.byisf.com:18001/bigScreen/view/1349193280059879426"></iframe>
  <iframe
    v-show="iframeState"
    id="show-iframe"
    frameborder="0"
    name="showHere"
    scrolling="auto"
    src="https://web.byisf.com:18001/bigScreen/view/1349193280059879426"
  ></iframe>
</template>

<script>
  export default {
    name: "tcgl.vue",
    created() {
      //this.getData();
export default {
  name: "tcgl.vue",
  created() {
    //this.getData();
  },
  data() {
    return {
      dialogTableVisible: false,
      form: {},
    };
  },
  mounted() {
    window.handleStartAnimalHeat = this.handleStartAnimalHeat;
    window.handleStartHealthcode = this.handleStartHealthcode;
    window.handleStartAlarm = this.handleStartAlarm;
  },
  methods: {
    //体温监测分页数据
    handleStartAnimalHeat(data) {
      this.$router.push({
        path: `/animalHeat/animalHeatPage`,
        query: data[0],
      });
    },
    data() {
      return {
        dialogTableVisible:false,
        form: {},
      }
    //健康码分页数据
    handleStartHealthcode(data) {
      this.$router.push({
        path: `/healthcode/healthcodePage`,
        query: data[0],
      });
    },
<<<<<<< HEAD
    mounted() {
      window.handleStartAnimalHeat = this.handleStartAnimalHeat;
      window.handleStartHealthcode = this.handleStartHealthcode;
@@ -57,31 +84,37 @@
          path: `/clientManagement/index`
        });
      }
=======
    //主动报警（一键求助，电话报警）分页数据
    handleStartAlarm(data) {
      this.$router.push({
        path: `/realTimePolice/index`,
        query: data[0],
      });
    },
>>>>>>> 1961bed1f17c953cab383102b28498152f1e6f70

      // getData() {
      //   var that = this;
      //
      //   window.clearTimeout(window.realTimeQuery);
      //
      //   window.realTimeQuery = setInterval(function () {
      //     //that.dialogTableVisible = true;
      //   }, 3000);
      // }
    }
  }
    // getData() {
    //   var that = this;
    //
    //   window.clearTimeout(window.realTimeQuery);
    //
    //   window.realTimeQuery = setInterval(function () {
    //     //that.dialogTableVisible = true;
    //   }, 3000);
    // }
  },
};
</script>

<style>
#show-iframe {
  display: block !important;
  height: 95%;
}

  #show-iframe {
    display: block !important;
    height: 95%;

  }

  .avue-main .avue-view {
    height: 100%;
    padding: 0px 5px !important;
  }

.avue-main .avue-view {
  height: 100%;
  padding: 0px 5px !important;
}
</style>

 src/views/policeTracking/policeTracking.vue

@@ -331,14 +331,17 @@
              <div>
                <el-image
                  :src="src"
                  :preview-src-list="srcList"
                  style="width: 150px; margin-left: 5px"
                ></el-image>
                <el-image
                  :src="src"
                  :preview-src-list="srcList"
                  style="width: 150px; margin-left: 5px"
                ></el-image>
                <el-image
                  :src="src"
                  :preview-src-list="srcList"
                  style="width: 150px; margin-left: 5px"
                ></el-image>
              </div>
@@ -374,7 +377,12 @@

          <el-row :align="center" style="margin-top: 40px">
            <el-col :offset="10">
              <el-button @click="onSubmit" type="danger">处理完成</el-button>
              <el-button
                @click="onSubmit"
                :disabled="form.jtype == 2 ? true : false"
                :type="form.jtype == 2 ? 'info' : 'danger'"
                >处理完成</el-button
              >
            </el-col>
          </el-row>
        </el-card>
@@ -412,6 +420,12 @@
      },
      src:
        "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
      srcList: [
        "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
        "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
        "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg",
        "https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg",
      ],
      form: {},
      itemOption: {
        menuBtn: false,
@@ -471,37 +485,143 @@
    this.getReceivingAlarm();
  },
  methods: {
    onSubmit() {
      var newAxios = axios.create({
        baseURL: "https://web.byisf.com:18001",
        withCredentials: false,
        headers: {},
      });
    getDate() {
      // 当前时间
      var timestamp = Date.parse(new Date());
      var serverDate = new Date(timestamp);

      newAxios
      // 本周周一的时间
      var mondayTime =
        timestamp - (serverDate.getDay() - 1) * 24 * 60 * 60 * 1000;
      var mondayData = new Date(mondayTime);
      //年
      var mondayY = mondayData.getFullYear();
      //月
      var mondayM =
        mondayData.getMonth() + 1 < 10
          ? "0" + (mondayData.getMonth() + 1)
          : mondayData.getMonth() + 1;
      //日
      var mondayD =
        mondayData.getDate() < 10
          ? "0" + mondayData.getDate()
          : mondayData.getDate();
      // 当前时间
      var currentData = new Date(timestamp);
      //年
      var currentY = currentData.getFullYear();
      //月
      var currentM =
        currentData.getMonth() + 1 < 10
          ? "0" + (currentData.getMonth() + 1)
          : currentData.getMonth() + 1;
      //日
      var currentD =
        currentData.getDate() < 10
          ? "0" + currentData.getDate()
          : currentData.getDate();
      //时
      var currenH =
        currentData.getHours() < 10
          ? "0" + currentData.getHours()
          : currentData.getHours();
      //分
      var currenM =
        currentData.getMinutes() < 10
          ? "0" + currentData.getMinutes()
          : currentData.getMinutes();
      //秒
      var currenS =
        currentData.getSeconds() < 10
          ? "0" + currentData.getSeconds()
          : currentData.getSeconds();

      return {
        day: {
          beginTime: currentY + "-" + currentM + "-" + currentD + " 00:00:00",
          endTime:
            currentY +
            "-" +
            currentM +
            "-" +
            currentD +
            " " +
            currenH +
            ":" +
            currenM +
            ":00",
        },
        week: {
          beginTime: mondayY + "-" + mondayM + "-" + mondayD + " 00:00:00",
          endTime:
            currentY +
            "-" +
            currentM +
            "-" +
            currentD +
            " " +
            currenH +
            ":" +
            currenM +
            ":00",
        },
        month: {
          beginTime: mondayY + "-" + mondayM + "-01 00:00:00",
          endTime:
            currentY +
            "-" +
            currentM +
            "-" +
            currentD +
            " " +
            currenH +
            ":" +
            currenM +
            ":00",
        },
        current:
          currentY +
          "-" +
          currentM +
          "-" +
          currentD +
          " " +
          currenH +
          ":" +
          currenM +
          ":" +
          currenS,
      };
    },
    onSubmit() {
      var that = this;
      axios
        .post(
          "/api/blade-jfpts/jingdan/jingdan/updateInfo",
          "/api/blade-jfpts/alarm/alarm/updateJtype",
          {},
          {
            params: {
              id: this.form.id,
              handleP: this.form.handleP,
              handName: this.form.handName,
              handletype: this.form.handletype,
              type: "2",
              jid: this.form.id,
              jtype: 2,
              rid: this.form.alarmId,
              bz: this.form.bz,
              snumber: this.form.alarmId,
              sname: this.form.alarmPeople,
              zc: "处理完成",
              zctime: this.getDate().current,
            },
          }
        )
        .then((res) => {
          if (res.data.msg == "修改成功") {
        .then(function (res) {
          if ((res.msg = "修改成功")) {
            var arr = [];
            this.$store.state.tags.tagList.forEach((item) => {
              if (item.value != this.$store.state.tags.tag.value) {
            that.$store.state.tags.tagList.forEach((item) => {
              if (item.value != that.$store.state.tags.tag.value) {
                arr.push(item);
              }
            });
            this.$store.state.tags.tagList = arr;
            this.$router.go(-1);
            that.$store.state.tags.tagList = arr;
            that.$router.go(-1);
          }
        });
    },

 src/views/realTimePolice/real.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-03-17 15:21:33
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-03-20 16:47:06
 * @Last Modified time: 2021-03-20 18:12:42
 */
<template>
  <basic-container>
@@ -812,35 +812,44 @@
      };

      if (
        this.$router.query &&
        this.$router.query != null &&
        this.$router.query != ""
        this.$route.query.waringType && 
        this.$route.query != undefined &&
        this.$route.query != null &&
        this.$route.query != ""
      ) {
        if (this.$router.query.status) {
          this.activeClass = this.$router.query.status;
        if (
          this.$route.query.status != undefined &&
          this.$route.query.status != null &&
          this.$route.query.status == ""
        ) {
          this.activeClass = this.$route.query.status;
          this.page.currentPage = 1;
          if (this.$router.query.status == 0) {
          if (this.$route.query.status == 0) {
            params = {
              waringType: this.$router.query.waringType,
              waringType: this.$route.query.waringType,
              beginTime: this.dateTime.day.beginTime,
              endTime: this.dateTime.day.endTime,
            };
          } else if (this.$router.query.status == 1) {
          } else if (this.$route.query.status == 1) {
            params = {
              waringType: this.$router.query.waringType,
              waringType: this.$route.query.waringType,
              beginTime: this.dateTime.week.beginTime,
              endTime: this.dateTime.week.endTime,
            };
          } else if (this.$router.query.status == 2) {
          } else if (this.$route.query.status == 2) {
            params = {
              waringType: this.$router.query.waringType,
              waringType: this.$route.query.waringType,
              beginTime: this.dateTime.month.beginTime,
              endTime: this.dateTime.month.endTime,
            };
          }
        } else {
          this.activeClass = 0;
          this.page.currentPage = 1;
          params = {
            waringType: this.$router.query.waringType,
            waringType: this.$route.query.waringType,
            beginTime: this.dateTime.day.beginTime,
            endTime: this.dateTime.day.endTime,
          };
        }
      }
@@ -859,6 +868,7 @@
          ...this.query,
        };
      }

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