Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

zengh

2021-03-26 6749726c0eb1b8ed4cf58a8b7f87434a5b732b37

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

 public/map/widgets/alertSecurity/AlertSecurity.js

@@ -279,7 +279,7 @@
    },

    addPoint: function (entitys, lgtd, lttd, img) {
      var symbol = new esri.symbol.PictureMarkerSymbol(img, 22, 32);
      var symbol = new esri.symbol.PictureMarkerSymbol(img, 33, 48);
      var pt = new Point(lgtd, lttd, new SpatialReference({
        wkid: 4326
      }));

 public/map/widgets/clientManagement/ClientManagement.js

@@ -218,7 +218,7 @@
      });

      //set up a class breaks renderer to render different symbols based on the cluster count. Use the required clusterCount property to break on.
      var defaultSym = new PictureMarkerSymbol("./images/ceshi.png", 32, 32).setOffset(0, 15);
      var defaultSym = new PictureMarkerSymbol("./images/jingbaored.png", 33, 48).setOffset(0, 15);
      var renderer = new ClassBreaksRenderer(defaultSym, "clusterCount");
      var xlSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.STYLE_CIRCLE, 32, new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID, new dojo.Color([200, 52, 59, 0.8]), 1), new dojo.Color([250, 65, 74, 0.8]));
      var lgSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.STYLE_CIRCLE, 28, new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID, new dojo.Color([41, 163, 41, 0.8]), 1), new dojo.Color([51, 204, 51, 0.8]));

 public/map/widgets/equipment/ClientManagement.js

@@ -218,7 +218,7 @@
      });

      //set up a class breaks renderer to render different symbols based on the cluster count. Use the required clusterCount property to break on.
      var defaultSym = new PictureMarkerSymbol("./images/ceshi.png", 32, 32).setOffset(0, 15);
      var defaultSym = new PictureMarkerSymbol("./images/jingbaored.png", 33, 48).setOffset(0, 15);
      var renderer = new ClassBreaksRenderer(defaultSym, "clusterCount");
      var xlSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.STYLE_CIRCLE, 32, new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID, new dojo.Color([200, 52, 59, 0.8]), 1), new dojo.Color([250, 65, 74, 0.8]));
      var lgSymbol = new SimpleMarkerSymbol(SimpleMarkerSymbol.STYLE_CIRCLE, 28, new SimpleLineSymbol(SimpleLineSymbol.STYLE_SOLID, new dojo.Color([41, 163, 41, 0.8]), 1), new dojo.Color([51, 204, 51, 0.8]));

 src/page/index/logo.vue

@@ -360,7 +360,11 @@
        url: "/api/blade-jfpts/alarm/alarm/getLimit",
        method: "get",
      }).then(function (response) {
        that.deviceId = response.data.data[0].id;
        if (response.data.data.length > 0) {
          that.deviceId = response.data.data[0].id;
        } else {
          that.deviceId = 0;
        }
        //获得最新ID，开启实时报警循环
        that.layerRealtime();
      });
@@ -417,11 +421,10 @@
                        url: `/api/blade-jfpts/rvideo/rVoid`,
                        timeout: 600000,
                        params: {
                            sourcePath: result.data.data.flv,
                            jid: that.form.id,
                          sourcePath: result.data.data.flv,
                          jid: that.form.id,
                        },
                      }).then((resdata) => {
                      });
                      }).then((resdata) => {});
                    });
                });


 src/views/policeTracking/policeTracking.vue

@@ -144,6 +144,16 @@
                </el-form-item>
              </el-col>
              <el-col span="12">
                <el-form-item label="历史视频">
                  <el-button type="primary" @click.stop="oldVideoSatart = true"
                    >视频播放
                  </el-button>
                </el-form-item>
              </el-col>
            </el-row>

            <el-row>
              <el-col span="12">
                <el-form-item label="备注">
                  <el-input
                    disabled="true"
@@ -490,6 +500,26 @@
        width="100%"
        height="100%"
      ></iframe>

      <el-dialog
        class="ss-video-dialog"
        width="100%"
        title="历史回放"
        :visible.sync="oldVideoSatart"
        :close-on-press-escape="false"
        :close-on-click-modal="false"
        append-to-body
      >
        <video
          :src="vaddress"
          muted="muted"
          autoplay="autoplay"
          loop
          id="old_video"
          style="width: 100%; height: 100%; object-fit: fill"
          controls
        ></video>
      </el-dialog>
    </el-col>
  </el-row>
</template>
@@ -575,12 +605,16 @@
      multipleSelection: [],
      ensureNames: "",
      baseUrl: "",
      oldVideoSatart: false,
      vaddress: null,
      peopleListX: [],
    };
  },
  created() {
    this.form = this.$route.query;
    this.vaddress = this.form.vaddress;
    this.getReceivingAlarm();
    this.baseUrl = `/map/index.html?ISinit=1&openid=AlertSecurity&id=${this.form.id}&jd=${this.form.jd}&wd=${this.form.wd}`;
    this.baseUrl = `/map/index.html?ISinit=1&openid=AlertSecurity&id=${this.form.id}&jd=${this.form.jd}&wd=${this.form.wd}&pid=${this.form.deptId}`;
  },
  mounted() {
    this.getList();
@@ -595,7 +629,7 @@
  updated() {
    var arr = [];
    this.tableData.forEach((item) => {
      if (item.roleName == "管理员") {
      if (item.id == this.form.oneId) {
        arr.push(item);
      }
    });
@@ -756,13 +790,31 @@
    getList() {
      var that = this;
      axios
        .get("/api/blade-user/pages?current=1&size=9999&deptId=&work_status=")
        .get(
          `/api/blade-user/page?current=1&size=9999&work_status=&deptId=`
        )
        .then(function (res) {
          that.tableData = [];
          var i = 0;

          res.data.data.records.forEach((item) => {
            if (item.roleName == "处警员" || item.roleName == "管理员") {
            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,