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

shuishen

2021-04-10 c0e2f986a90d55ae6d75095344fcf4e6589f89af

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

 public/img/bg/bgzs.png

 src/styles/alarmAnalysis/alarmAnalysis.scss

@@ -207,6 +207,7 @@

//确认时间占比
.confirmTimePro {
    display: none;
  background-color: #ffffff;
  width: 61.6%;
  height: 450px;
@@ -269,6 +270,7 @@

//预警平均确认速度排行
.confirmAverageSpeed {
    display: none;
  background-color: #ffffff;
  width: 35%;
  height: 450px;
@@ -285,9 +287,8 @@

.confirmAverageSpeed .avue-crud {
  width: 90%;
  position: absolute;
  top: 12%;
  left: 4%;
    position: relative;
    top: 10%;
}

.confirmAverageSpeed .avue-crud__menu {
@@ -301,7 +302,7 @@
  height: 450px;
  position: relative;
  left: 0.8%;
  top: -38%;
    top: 12%;
}

#alarmTimeDisEchars {
@@ -318,13 +319,13 @@
  height: 50px;
  position: relative;
  left: 0.8%;
  top: -38%;
    top: 9%;
}

.el-button .btn-color {
  color: rgb(255, 255, 255);
  background-color: #29C093;
  border-color: #29C093;
    background-color: #29C093 !important;
    border-color: #29C093 !important;
}

// .el-icon-bell:before {

 src/views/animalHeat/animalHeat.vue

@@ -12,6 +12,7 @@
               @row-update="rowUpdate"
               @row-save="rowSave"
               @row-del="rowDel"
               @row-click="rowClick"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
@@ -40,18 +41,33 @@
          </el-button>
        </template>
    </avue-crud>

    <template>
      <div>
          <el-image-viewer
              class="img"
              v-if="showViewer"
              :on-close="closeViewer"
              :url-list="[imgUrl]" />
      </div>
    </template>
  </basic-container>
</template>

<script>
  import {getList} from "@/api/animalHeat/animalHeat";
  import {mapGetters} from "vuex";
  import ElImageViewer from 'element-ui/packages/image/src/image-viewer'

  export default {
    name:'index',
    components: { ElImageViewer },
    data() {
      return {
        form: {},
        query: {},
        showViewer:false,
        imgUrl:'',
        loading: true,
        page: {
          pageSize: 10,
@@ -96,21 +112,15 @@
              label: "体温",
              prop: "tempRed"
            },
            {
              label: '图片',
              prop: 'picture',
              type: 'upload',
              width: 300,
              listType: 'picture-img',
              span: 24,
              propsHttp: {
                res: 'data'
              },
              canvasOption: {
                text: 'avue',
                ratio: 0.1
              }
            },
            // {
            //   label: '图片',
            //   prop: 'picture',
            //   type: 'img',
            //   alone:false,
            //   width: 300,
            //   //listType: 'picture-img',
            //   span: 24
            // },
            {
              label: "检测时间",
              prop: "dateTime",
@@ -213,6 +223,17 @@
           }
         }
      },
      //图片行点击事件
      rowClick(row){
        var that = this;
        that.imgUrl = row.picture;
        console.log(that.imgUrl,111);
        this.showViewer = true
      },
      // 关闭查看器
      closeViewer() {
        this.showViewer = false
      },
      getAnimalData(e) {
        this.activeClass=e;
        //type 0:本日  1：本月  2：本年   status: 0:正常   1：异常
@@ -295,10 +316,16 @@
    }
  };
</script>
<style scoped>
<style lang="scss">
  .el-button.btn-color {
    color: rgb(255, 255, 255);
    background-color: rgb(64, 158, 255);
    border-color: rgb(64, 158, 255);
  }

  .img {
      .el-icon-circle-close {
        color: white;
      }
  }
</style>

 src/views/system/cs.vue

@@ -531,8 +531,10 @@
  watch:{
    'form.map':{// form是表单或者表格绑定的数据集，v-model='form'
      handler(val){
        if (val!=undefined) {
        this.form.jd = val.latitude
        this.form.wd = val.longitude
        }
      },
      immediate: true
    }