ll
liukangdong
2025-03-10 22c4be57bd51aac52f872e52c4a9a1b4c24ca625
ll
已修改4个文件
49 ■■■■■ 文件已修改
admin/src/components/base/BaseComputHeight.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/common/QueryForm/queryForm.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/dangerStatic.vue 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/visitEvent.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/base/BaseComputHeight.vue
@@ -33,8 +33,8 @@
        const height12 = document.getElementsByClassName('platgroup_tabs') && document.getElementsByClassName('platgroup_tabs')[0]?20+ document.getElementsByClassName('platgroup_tabs')[0].clientHeight:0
        // this.tableHeightNew = height-height4-height3-height2-height1-height5-height6-height7-height8-height9 -height10// 打印高度
       this.tableHeightNew = height-height3 -height5-height6-height2-height7-height4-height9-height10 -height11 -height12
        console.log('self',height,height3 ,height5,(height6==0?20:height6),height2,height7,height4,height9,height10 ,height11 ,height12)
        console.log('self',this.tableHeightNew)
        // console.log('self',height,height3 ,height5,(height6==0?20:height6),height2,height7,height4,height9,height10 ,height11 ,height12)
        // console.log('self',this.tableHeightNew)
      })
    }
  }
admin/src/components/common/QueryForm/queryForm.vue
@@ -30,7 +30,7 @@
            :clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
            :placeholder="item.label" :picker-options="item.pickerOptions || {}" @change="changeForm(item.filed)" />
        </el-form-item>
        <el-form-item label="起止时间" v-if="item.type === 'datetime' && (showZk || index < listLength)" :key="item.filed1">
        <el-form-item :label="item.label ? item.label : '起止时间'" v-if="item.type === 'datetime' && (showZk || index < listLength)" :key="item.filed1">
          <el-date-picker v-model="searchForm[item.filed1]" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
            class="w200"
            :clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
admin/src/views/business/dangerStatic.vue
@@ -13,11 +13,18 @@
    <div class="main_content">
      <div class="type_wrap">
        <div class="title">隐患类型统计</div>
        <div class="echart1" ref="typeRef"></div>
        <div v-show="typeList && typeList.length > 0" class="echart1" ref="typeRef"></div>
        <div v-show="typeList.length == 0" style="width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;">
          <img style="width: 240px;" src="@/assets/images/default_homeimg.png" alt="">
        </div>
      </div>
      <div class="dept_wrap">
        <div class="title">隐患归属部门统计</div>
        <div class="echart2" ref="deptRef"></div>
        <div v-show="deptList && deptList.length > 0" class="echart2" ref="deptRef"></div>
        <div v-show="deptList.length == 0" style="width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;">
          <img style="width: 240px;" src="@/assets/images/default_homeimg.png" alt="">
        </div>
      </div>
    </div>
  </div>
@@ -35,7 +42,7 @@
  data() {
    return {
      filters: {
        fastdate: '',
        fastdate: '29',
        queryStartTime: '',
        queryEndTime: ''
      },
@@ -48,7 +55,7 @@
            options: [
              { label: '待处理', value: '0' },
              { label: '已处理', value: '1' },
              { label: '不处理', value: '2' },
              { label: '已退回', value: '2' },
            ]
          },
          {
@@ -70,8 +77,8 @@
    }
  },
  mounted() {
    // this.changeRadio('0')
    this.getData()
    this.changeRadio('29')
    // this.getData()
  },
  methods: {
    changeRadio(day) {
@@ -85,8 +92,11 @@
        if (res) {
          this.typeList = res.cateList || []
          this.deptList = res.departmentList || []
          this.initType()
          this.initDept()
          this.$nextTick(() => {
            this.initType()
            this.initDept()
          })
        }
      })
@@ -100,13 +110,13 @@
      this.typeList.forEach(i => {
        total += i.total
      })
      let colors = ['#d75a44', '#e39f4d', '#7ac7f6', '#7ac7f6', '#4469ee', '#698af0', '#9fb5f4', '#b6c7f7', '#c8d5f8']
      let colors = ['#d75a44', '#e39f4d', '#f0d05f', '#7ac7f6', '#4469ee', '#698af0','#86a2f1','#a1b4f6','#a0b5f5', '#9fb5f4', '#b6c7f7', '#c8d5f8']
      let option = {
        title: [
          {
            text: '隐患总数',
            top: '46%',
            left: '46%',
            left: '45%',
            textStyle: {
              color: '#666666',
              fontSize: 16,
@@ -114,7 +124,7 @@
          }, {
            text: total,
            top: '50%',
            left: '48%',
            left: '47.6%',
            textStyle: {
              color: '#080404',
              fontSize: 24,
@@ -139,9 +149,8 @@
        },
        series: [
          {
            name: 'Access From',
            type: 'pie',
            radius: ['28%', '46%'],
            radius: ['24%', '40%'],
            label: {
              formatter: "{a|{b}}\n\n{c} | {d}%",
              rich: {
@@ -250,7 +259,7 @@
  }
  .type_wrap {
    flex: 5;
    flex: 11;
    flex-shrink: 0;
    height: calc(100% - 20px);
    border-right: 12px solid #f7f7f7;
@@ -263,7 +272,7 @@
  }
  .dept_wrap {
    flex: 4;
    flex: 10;
    flex-shrink: 0;
    height: calc(100% - 20px);
    padding-left: 20px;
admin/src/views/business/visitEvent.vue
@@ -52,8 +52,8 @@
      <ul class="toolbar" v-permissions="['business:visitevent:exportExcel']">
        <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:visitevent:exportExcel']"
            @click="exportExcel">导出</el-button></li>
        <li class="ml20"> 拜访人次:<span class="primaryColor">{{staticObj.eventNum}}次</span></li>
        <li class="ml20"> 拜访人数:<span class="primaryColor">{{staticObj.visitorNum}}人</span></li>
        <li class="ml20"> 入园次数:<span class="primaryColor">{{staticObj.eventNum}}次</span></li>
        <li class="ml20"> 入园人数:<span class="primaryColor">{{staticObj.visitorNum}}人</span></li>
      </ul>
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column prop="personName" label="姓名" min-width="90px"></el-table-column>