ZZJ
2022-07-28 edef6ae8f59823258ce610c9074d32e698958b51
src/views/hashrate/CameraManage/CameraInfo/index.vue
@@ -146,7 +146,7 @@
        <div class="title">算力信息</div>
        <div class="hashrate">
          <div class="card">
            <img src="/images/hashrate/实时算力.png" alt="" />
            <img src="/images/hashrate/realTime2.png" alt="" />
            <div class="data">
              <div class="label">实时算力</div>
              <div class="number">
@@ -157,7 +157,7 @@
          </div>
          <div class="card">
            <img src="/images/hashrate/轮询算力.png" alt="" />
            <img src="/images/hashrate/polling.png" alt="" />
            <div class="data">
              <div class="label">轮询算力</div>
              <div class="number">
@@ -168,7 +168,7 @@
          </div>
          <div class="card">
            <img src="/images/hashrate/数据栈算力.png" alt="" />
            <img src="/images/hashrate/static.png" alt="" />
            <div class="data">
              <div class="label">数据栈算力</div>
              <div class="number">
@@ -204,6 +204,7 @@
            :rtspUrl="videoItem.rtsp"
            :isRunning="false"
            :showArea="false"
            :videoUrl="ip"
            v-if="
              videoItem !== '' &&
              videoItem !== undefined &&
@@ -261,6 +262,7 @@
      togglePlay: true,
      eventAudio: new Audio(),
      soundPath: "",
      ip: "",
      form: {},
      // 记录添加状态
      isAdd: false,
@@ -375,6 +377,8 @@
      if (node.type === "4") {
        getCameraInfo(node.id).then((res) => {
          if (res.success) {
            this.ip = "ws://" + res.data.ip + ":7009/ws";
            if (res.data.resolutions) {
              let list = res.data.resolutions.map((i) => {
                let obj = {};
@@ -407,7 +411,7 @@
                this.form.isAI = false;
              }
              this.form.resolution =
                this.form.resolutionWidth + "*" + this.form.resolutionHeight;
                this.form.resolution_width + "*" + this.form.resolution_height;
            });
          }
        });
@@ -428,10 +432,10 @@
            ? 0
            : parseFloat(this.form.longitude);
          this.form.sensors = list;
          this.form.resolutionWidth = Number(
          this.form.resolution_width = Number(
            this.form.resolution.split("*")[0]
          );
          this.form.resolutionHeight = Number(
          this.form.resolution_height = Number(
            this.form.resolution.split("*")[1]
          );
          let _this = this;
@@ -446,10 +450,10 @@
            let tem = {
              camera: this.form,
              sensors: this.form.sensors,
              areaid: this.form.areaid,
            };
            tem.camera.clusterId = this.TreeDataPool.clusterId;
            tem.camera.devId = this.TreeDataPool.devId;
            tem.camera.clusterId = sessionStorage.getItem("clusterId");
            tem.camera.devId = sessionStorage.getItem("devId");
            delete tem.camera.sensors;
            updateCameraInfo(tem)
              .then((rsp) => {
@@ -476,22 +480,19 @@
                  });
                }
              })
              .catch((err) => {
                this.$notify({
                  type: "error",
                  message: err.msg,
                });
              });
              .catch((err) => {});
          } else {
            this.form.areaid = this.addParentId;
            let tem = {
              camera: this.form,
              sensors: this.form.sensors,
              areaid: this.form.areaid,
            };
            tem.camera.clusterId = this.TreeDataPool.clusterId;
            tem.camera.devId = this.TreeDataPool.devId;
            tem.camera.clusterId = sessionStorage.getItem("clusterId");
            tem.camera.devId = sessionStorage.getItem("devId");
            tem.camera.parentUserId = "";
            tem.camera.enable = false;
            delete tem.camera.sensors;
            createCamera(tem)
              .then((rsp) => {
                if (rsp.success) {
@@ -499,7 +500,7 @@
                    type: "success",
                    message: "摄像机添加成功!",
                  });
                  this.TreeDataPool.selectedNode = rsp.data;
                  this.TreeDataPool.selectedNode = rsp.data.camera;
                  this.TreeDataPool.fetchTreeData();
                  // 后端返回结果为0,查询后为4
                  this.TreeDataPool.selectedNode.type = "4";
@@ -529,7 +530,7 @@
          name: this.form.name,
          rtsp: this.form.rtsp,
          id: this.form.id,
          isRunning: this.form.runEnable,
          isRunning: this.form.run_enable,
          cameraType: this.form.type,
        };
@@ -560,6 +561,13 @@
        cancelButtonClass: "comfirm-class-cancle",
        confirmButtonClass: "comfirm-class-sure",
      }).then(() => {
        if (!this.form.id) {
          this.$notify({
            type: "warning",
            message: "尚未添加摄像机",
          });
          return;
        }
        delCamera({
          id: this.form.id,
          clusterId: this.TreeDataPool.clusterId,
@@ -609,6 +617,20 @@
    addDevice(node) {
      this.isAdd = true;
      this.addParentId = node;
      this.resolutionList = [
        {
          label: "本机分辨率",
          value: "0*0",
        },
        {
          label: "1920*1080",
          value: "1920*1080",
        },
        {
          label: "2688*1520",
          value: "2688*1520",
        },
      ];
      this.initFormData();
    },
  },
@@ -717,7 +739,7 @@
      .connect {
        margin-bottom: 20px;
        display: flex;
        justify-content: end;
        justify-content: flex-end;
      }
      .el-button {
@@ -844,7 +866,7 @@
  .btns {
    display: flex;
    justify-content: end;
    justify-content: flex-end;
    margin-top: 20px;
    .delBtn {