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

liuyg

2021-05-09 4f11d6a54ade61ba7daf8ba856014d2f8994badf

 src/views/clientManagement/clientManagement.vue

@@ -30,7 +30,7 @@
                   @refresh-change="refreshChange"
                   @on-load="onLoad"
                   @row-click="rowClick">
                   

          <template slot="menuLeft">
            <el-button type="danger"
                       size="mini"
@@ -67,11 +67,17 @@
<!--            </el-button>-->
<!--          </template>-->

          <template slot-scope="{ row }" slot="dxzt">
            <el-tag>{{
              row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "在线" : "无"
          <template class="tdtype" slot-scope="{ row }" slot="dxzt">
            <el-tag class="dtype">
              {{
              row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "正常" :row.dxzt == "2" ? "预警":row.dxzt == "3" ? "故障":"无"
              }}
              <i class="dx" v-if="row.dxzt == '0' "></i>
              <i class="zc" v-if="row.dxzt == '1' "></i>
              <i class="yj" v-if="row.dxzt == '2' "></i>
              <i class="gz" v-if="row.dxzt == '3' "></i>
            </el-tag>

          </template>

          <template slot-scope="{ row }" slot="type">
@@ -141,7 +147,7 @@
            </el-form-item>
          </el-col>
        </el-form>
        

      </el-dialog>


@@ -213,17 +219,28 @@
    },
    data() {
      return {
        dataLIU:{
          color:"#DFDFDF"
        },
        //legend-liu数据
        datalistLIU:[
                {
                    color: 'rgb(236, 83, 37)',
                    color: "#DFDFDF",
                    text: '掉线'
                },
                {
                    color: 'rgb(49, 49, 49)',
                    text: '在线'
                    color: "#29C093",
                    text: '正常'
                },
                {
                    color: "#F34A4A",
                    text: '预警'
                },
                {
                    color: "#F48F57",
                    text: '故障'
                }
            ],
        ],
        form: {},
        query: {},
        showMap: false,
@@ -231,6 +248,7 @@
        initFlag: true,
        loading: true,
        menuVisible:false,
        isEdit:false,
        page: {
          pageSize: 10,
          currentPage: 1,
@@ -463,7 +481,8 @@
              label: "故障状态",
              prop: "state",
              addDisplay: false,
              editDisplay: false
              editDisplay: false,
              hide:true
            },
            {
              label: "故障原因",
@@ -575,7 +594,7 @@
              },
              span:5,
            },
             

            {
              label: "主要负责人",
              prop: "oneId",
@@ -707,28 +726,34 @@
          if (val) {
            var that = this;
            //重新加载一次页面详情数据，解决新的省市区无法写入问题
            getclient(this.form.id).then(res => {
              this.form = res.data.data;
              //经纬度替换
              this.form.wd = val.latitude;
              this.form.jd = val.longitude;
              //地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
              var address = val.formattedAddress.toString();
              if(address.search("县") != -1){
                  this.form.street = address.substring(address.indexOf("县")+1,address.length);
            //判断是新增还是修改
            if(that.isEdit){
                getclient(this.form.id).then(res => {
                  // that.province = res.data.data.province;
                  // that.city = res.data.data.city;
                  // that.district = res.data.data.district;
                });
              }
              if(address.search("区") != -1){
                this.form.street = address.substring(address.indexOf("区")+1,address.length);
              }
              //写入新的省市区
              that.form.province = val.addressComponent.province;
              if(val.addressComponent.city==""){
                  that.form.city = val.addressComponent.province;
              }else{
                  that.form.city = val.addressComponent.city;
              }
              that.form.district = val.addressComponent.district;
            });

            //经纬度替换
            this.form.wd = val.latitude;
            this.form.jd = val.longitude;
            //地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
            var address = val.formattedAddress.toString();
            if(address.search("县") != -1){
                this.form.street = address.substring(address.indexOf("县")+1,address.length);
            }
            if(address.search("区") != -1){
              this.form.street = address.substring(address.indexOf("区")+1,address.length);
            }
            //写入新的省市区
            that.form.province = val.addressComponent.province;
            if(val.addressComponent.city==""){
                that.form.city = val.addressComponent.province;
            }else{
                that.form.city = val.addressComponent.city;
            }
            that.form.district = val.addressComponent.district;
          }
        },
        immediate: true,
@@ -779,7 +804,7 @@
      //     this.initData();
      //   }
      // }
      

    },
    computed: {
      ...mapGetters(["permission"]),
@@ -819,7 +844,7 @@
        });
      },

      //初始化数据  
      //初始化数据
      // initData() {
      //   //部门tree数据
      //   getDeptTree().then(res => {
@@ -827,7 +852,7 @@
      //     column.dicData = res.data.data;
      //   });
      // },
      

      handleClick(row) {
        this.form = row;
        this.dialogTableVisible = true;
@@ -839,6 +864,7 @@
        this.onLoad(this.page);
      },
      rowSave(row, done, loading) {
        row.deptId = row.deptId.join(",");
        add(row).then(() => {
          this.onLoad(this.page);
          this.$message({
@@ -852,8 +878,9 @@
        });
      },
      rowUpdate(row, index, done, loading) {
        // row.jd=row.map.latitude;
        // row.wd=row.map.longitude;
        if(Array.isArray(row.deptId)){
            row.deptId = row.deptId.join(",");
        }
        update(row).then(() => {
          // this.initFlag = false;
          this.onLoad(this.page);
@@ -929,7 +956,11 @@
        if (["edit", "view"].includes(type)) {
          getclient(this.form.id).then(res => {
            this.form = res.data.data;
            this.isEdit=true;
          });
        }
        if (["add"].includes(type)) {
          this.isEdit=false;
        }
        // this.initFlag = true;
        done();
@@ -986,32 +1017,67 @@
            } else if (data.records[i].heartbeat == "") {
              data.records[i].dxzt = 0;
            } else {
              data.records[i].dxzt = 1;
              if(data.records[i].dtype==1){
                  data.records[i].dxzt = data.records[i].dtype;
              }
              if(data.records[i].dtype==2){
                  data.records[i].dxzt = 2;
              }
              if(data.records[i].dtype==3){
                  data.records[i].dxzt = 3;
              }
              if(data.records[i].dtype=="" || data.records[i].dtype==0){
                  data.records[i].dxzt = 1;
              }

            }
          }

          data.records.sort((a, b) => {
            return a.dxzt - b.dxzt;
          });
          // data.records.sort((a, b) => {
          //   return a.dxzt - b.dxzt;
          // });

          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
      }, rowStyle({row, column, rowIndex}) {
        if (row.heartbeat != null && row.heartbeat != "") {
          var date = new Date(row.heartbeat).getTime();
          var Dqdate = new Date().getTime();
          if ((Dqdate - date) >= (60 * 60 * 24 * 1000)) {
        // if (row.heartbeat != null && row.heartbeat != "") {
        //   var date = new Date(row.heartbeat).getTime();
        //   var Dqdate = new Date().getTime();
        //   if ((Dqdate - date) >= (60 * 60 * 24 * 1000)) {
        //     return {
        //       color: "#fe1515"
        //     };
        //   }

        // } else if (row.heartbeat == "") {
        //   return {
        //     color: "#fe1515"
        //   };
        // }

        if(row.dtype!=null && row.dtype!=""){
          // if(row.dtype=='0'){
          //   return {
          //     color: "#DFDFDF"
          //   };
          // }
          // if(row.dtype=='1'){
          //   return {
          //     color: "#29C093"
          //   };
          // }
          if(row.dtype=='2'){
            return {
              color: "#fe1515"
              color: "#F34A4A"
            };
          }

        } else if (row.heartbeat == "") {
          return {
            color: "#fe1515"
          };
          // if(row.dtype=='3'){
          //   return {
          //     color: "#F48F57"
          //   };
          // }
        }
      },
      handleManage(row) {
@@ -1038,15 +1104,19 @@
        });

      }, handleStart(row) {

        console.log(row,11111111111);
        row = this.selectRow;
        console.log(row,22222222222);
        var arr = [];
        console.log(this.$store.state.tags.tagList,3333333);
        this.$store.state.tags.tagList.forEach(item => {
          if (item.label != "视频") {
            arr.push(item);
          }
        });
        this.$store.state.tags.tagList = arr;
        console.log(arr)
        console.log(arr,444444444444);
        this.$router.push({
          path: `/real/video/`, query: row
        });
@@ -1055,7 +1125,7 @@
        this.showMap = true;
        this.$nextTick(() => {
          this.$refs.mapDiv.onload = () => {
            window.frames[0].init("equipment", {x: row.jd, y: row.wd});
            window.frames[1].init("equipment", {x: row.jd, y: row.wd});
          };
        })
      },rightClick(row, event) {
@@ -1190,6 +1260,51 @@
    color: red;
  }

  .dtype{
    width: 80px;
  }

  .dx{
    position: absolute;
    top: 50%;
    margin-top: -5px;
    margin-left: 6px;
    width: 10px;
    height: 10px;
    border-radius: 30%;
    background: #DFDFDF;
  }
  .zc{
    position: absolute;
    top: 50%;
    margin-top: -5px;
    margin-left: 6px;
    width: 10px;
    height: 10px;
    border-radius: 30%;
    background: #29C093;
  }
  .yj{
    position: absolute;
    top: 50%;
    margin-top: -5px;
    margin-left: 6px;
    width: 10px;
    height: 10px;
    border-radius: 30%;
    background: #F34A4A;
  }
  .gz{
    position: absolute;
    top: 50%;
    margin-top: -5px;
    margin-left: 6px;
    width: 10px;
    height: 10px;
    border-radius: 30%;
    background: #F48F57;
  }

  .tabFontSize{
    font-size: 15px;
  }