南昌市物联网技防平台-前端
liuyg
2021-04-29 fa6fde084a3f6bd75e792c9ecfeda1ef683e7307
视频进度条  其他细节
4 files modified
85 ■■■■ changed files
public/map/popup/html/FlareClusterLayer_v3 copy.html 12 ●●●● patch | view | raw | blame | history
public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js 2 ●●● patch | view | raw | blame | history
src/views/dataL/dataL.vue 3 ●●●●● patch | view | raw | blame | history
src/views/system/cs.vue 68 ●●●● patch | view | raw | blame | history
public/map/popup/html/FlareClusterLayer_v3 copy.html
@@ -156,6 +156,10 @@
        .el-tabs__item:hover {
            color: #5d5d5d;
        }
        video::-webkit-media-controls-timeline {
            display: none;
        }
    </style>
</head>
@@ -289,7 +293,11 @@
                                // console.log(imgD)
                                var imgdatas = [];
                                if (imgD.data.length != 0) {
                                    imgdatas = imgD.data[0].paddress.split(',');
                                    if (imgD.data[0].paddress.length != 0) {
                                        imgdatas = imgD.data[0].paddress.split(',');
                                    } else {
                                        my.imgsl = imgdatas.length == 0 ? ['no'] : imgdatas;
                                    }
                                } else {
                                }
@@ -408,7 +416,7 @@
                                            dom.play();
                                        });
                                        that.hls.on(Hls.Events.ERROR, function (event, data) {
                                            console.log(data, 4566824159, "视频播放有问题!!!");
                                            // console.log(data, 4566824159, "视频播放有问题!!!");
                                            if (data.fatal) {
                                                switch (data.type) {
                                                    case Hls.ErrorTypes.NETWORK_ERROR:
public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js
@@ -1118,7 +1118,7 @@
      var shapeCenter = this._getShapeCenter(cluster.graphicShape);
      var textShape = groupShape.createText({
        x: shapeCenter.x,
        y: shapeCenter.y + (this.textSymbol.font.size / 2 - 2),
        y: shapeCenter.y + (this.textSymbol.font.size / 2 - 6),//聚合文字设置
        text: cluster.clusterCount,
        align: 'middle'
      })
src/views/dataL/dataL.vue
@@ -1718,4 +1718,7 @@
  margin-bottom: 0;
  width: 50%;
}
video::-webkit-media-controls-timeline {
      display: none;
    }
</style>
src/views/system/cs.vue
@@ -99,7 +99,7 @@
      append-to-body="true"
      class="right-open"
    >
      <el-divider ></el-divider>
      <el-divider></el-divider>
      <div class="r-o-our">
        <avue-crud
          :option="options"
@@ -112,6 +112,22 @@
          @current-change="currentChanges"
          @size-change="sizeChanges"
        >
          <template slot="states" slot-scope="scope">
            <el-tag
              :class="[
                scope.row.states == '掉线'
                  ? 'diaoxianl'
                  : scope.row.states == '在线'
                  ? 'zaixianl'
                  : scope.row.states == '故障'
                  ? 'guzhagnl'
                  : scope.row.states == '预警'
                  ? 'baojinl'
                  : '',
              ]"
              >{{ scope.row.states }}</el-tag
            >
          </template>
        </avue-crud>
      </div>
    </el-dialog>
@@ -172,7 +188,7 @@
        height: "auto",
        indexLabel: "序号",
        index: true,
        card:true,
        card: true,
        menu: false,
        header: false,
        searchShow: true,
@@ -207,7 +223,7 @@
          {
            label: "设备编号",
            prop: "deviceNumber",
            width: 110,
            width: 110,
          },
          {
            label: "使用方",
@@ -233,6 +249,8 @@
            label: "设备状态",
            prop: "states",
            width: 90,
            slot: true,
            // className: "cityClass1",
          },
        ],
      },
@@ -730,10 +748,10 @@
          }
          //写入新的省市区
          that.form.province = val.addressComponent.province;
          if(val.addressComponent.city==""){
              that.form.city = val.addressComponent.province;
          }else{
              that.form.city = val.addressComponent.city;
          if (val.addressComponent.city == "") {
            that.form.city = val.addressComponent.province;
          } else {
            that.form.city = val.addressComponent.city;
          }
          that.form.district = val.addressComponent.district;
        }
@@ -762,7 +780,7 @@
      return this.selectionList[0].tenantId;
    },
  },
  methods: {
  methods: {
    rowSave(row, done, loading) {
      add(row).then(
        () => {
@@ -1124,6 +1142,7 @@
    },
    changeDataOpen(dat) {
      //处理弹出框数据
      console.log(dat);
      if (dat.length > 0) {
        for (var key in dat) {
          let states;
@@ -1153,7 +1172,7 @@
    },
    getMout(fid) {
      getListliuc(fid).then((res) => {
      // console.log(res.data.data);
        // console.log(res.data.data);
        this.getUser(res.data.data);
      });
    },
@@ -1203,17 +1222,17 @@
      // this.pages.total = 40;
      // console.log(1)
      this.loadings = true;
    //  console.log(2)
      //  console.log(2)
      let values = {
        ...params,
      };
        // console.log(3)
      // console.log(3)
      // getListliu(1, 10, {}, val.id).then((res) => {
        var useId = this.onceData.deptId;
          // console.log(4)
      var useId = this.onceData.deptId;
      // console.log(4)
      getListliu(pages.currentPage, pages.pageSize, values, useId).then(
        (res) => {
            // console.log(5)
          // console.log(5)
          // console.log(pages.currentPage, pages.pageSize, values, useId,332332)
          // console.log(this.datas);
          // getListliu('1', '10', {}, '1353972967828533249').then((res) => {
@@ -1230,7 +1249,6 @@
          this.loadings = false;
        }
      );
    },
  },
  mounted() {},
@@ -1404,4 +1422,24 @@
    overflow: auto;
  }
}
.diaoxianl {
  border: 1px solid #fff;
  color: #fff;
  background-color: #cdcdcd;
}
.zaixianl {
  border: 1px solid #fff;
  color: #fff;
  background-color: #32c1a2;
}
.guzhagnl {
  border: 1px solid #fff;
  color: #fff;
  background-color: #f49966;
}
.baojinl {
  border: 1px solid #fff;
  color: #fff;
  background-color: #f35b5b;
}
</style>