优化滚动分页，封装组件，

licp

2024-04-24 70b128785737df0d6065b09a75cf79b49efe22fa

优化滚动分页，封装组件，

 src/assets/api/controller.js

@@ -138,6 +138,7 @@
  delInsOrderTemplate: "/insOrder/delInsOrderTemplate", //删除检验单模板
    selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //通过检验单查询检验数据（数据查看）
    costStatistics: "/insOrder/costStatistics", //费用统计
  selectSampleDefects: "/insOrder/selectSampleDefects", //样品缺陷指标
}

const sampleOrder = {

 src/components/tool/scroll-paging.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
<template>
  <div class="scroll-pagination"  ref="content" @scroll="scrollFn">
    <slot></slot>
    <el-button
        v-if="isLoding"
        type="text"
        style="display: flex; margin: 0 auto; color: #909399"
        ><i class="el-icon-loading" style="font-size:20px"></i
      ></el-button>
    <el-button
      type="text"
      v-if="finishLoding"
      style="display: flex; margin: 0 auto; color: #909399"
      >已经没有更多啦~</el-button
    >
  </div>
</template>

<script>
export default {
  name: 'ScrollPagination',
  props: {
    finishLoding: {
      type:Boolean,
      default:false
    }
  },
  data() {
    return {
      isLoding: false,
    }
  },
  mounted(){
    window.addEventListener("scroll", this.throttle(this.scrollFn, 20000));
  },
  methods: {
    scrollFn() {
      let content = this.$refs.content
      if (content.scrollTop + content.clientHeight >= content.scrollHeight) {
        if(!this.finishLoding){
          this.loadMore()
        }else{
          this.isLoding = false
        }
      }
    },
    loadMore(){
      if (this.isLoding) return
      this.isLoding = true
      // Simulate loading data (replace with your own API call)
      setTimeout(() => {
        this.$emit('load')
        this.isLoding = false
      }, 1000)
    },
    throttle(fn, wait) {
      // å°è£…函数进行节流
      var timer = null;
      return function () {
        var context = this;
        var args = arguments;
        if (!timer) {
          timer = setTimeout(function () {
            fn.apply(context, args);
            timer = null;
          }, wait);
        }
      };
    },
  },
  destroyed() {
    window.removeEventListener("scroll", this.throttle(), false);
  },
}
</script>

<style scoped>
.scroll-pagination {
  height: 100%;
  overflow-y: auto;
}
</style>

 src/components/tool/value-table.vue

@@ -1059,7 +1059,7 @@
                return count * 15 + 60 + 'px'
            },
      handleSuccessUp(response,label){
        if(label){
        if(typeof label === 'string'){
          if(response.code==200){
            this.upData[label] = response.data.url;
          }

 src/components/view/a6-device-management.vue

@@ -77,7 +77,7 @@
                        v-model="componentData.entity.specificationModel" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing">
                <div class="search_label">设备大类：</div>
                <div class="search_label">设备分类：</div>
                <el-select v-model="componentData.entity.largeCategory" placeholder="请选择">
                    <el-option v-for="item in equipmentList" :key="item.value" :label="item.label" :value="item.value">
                    </el-option>
@@ -199,7 +199,7 @@
                        <el-form-item label="规格型号:">
                            <el-input :disabled="isUp" v-model="formData.specificationModel" size="small"></el-input>
                        </el-form-item>
                        <el-form-item label="设备状态:">
                        <el-form-item label="当前状态:">
                            <el-select :disabled="isUp" v-model="formData.deviceStatus" placeholder="请选择" size="small"
                                style="width:100%">
                                <el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
@@ -277,13 +277,20 @@
                            </div>
                        </el-image>
                        <!-- è¡¨å• -->
                        <el-form :label-position="labelPosition" :model="formData2" label-width="90px">
                            <el-form-item label="出厂日期:">
                                <el-date-picker style="width:100%" v-model="formData2.dateProduction" type="datetime" size="small"
                                    format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期">
                                </el-date-picker>
                        <el-form :label-position="labelPosition" :model="formData2" label-width="100px">
                            <el-form-item label="仪器名称:">
                <el-input v-model="formData2.deviceName" size="small"></el-input>
                            </el-form-item>
                            <el-form-item label="设备负责人:">
              <el-form-item label="仪器名称EN:">
                <el-input v-model="formData2.deviceName" size="small"></el-input>
                            </el-form-item>
              <el-form-item label="规格型号:">
                <el-input v-model="formData2.deviceName" size="small"></el-input>
                            </el-form-item>
              <el-form-item label="生产厂家:">
                <el-input v-model="formData2.deviceName" size="small"></el-input>
                            </el-form-item>
                            <!-- <el-form-item label="设备负责人:">
                                <el-select v-model="formData2.equipmentManager" placeholder="请选择" size="small" style="width:100%">
                                    <el-option v-for="item in responsiblePersonList" :key="item.value" :label="item.label"
                                        :value="item.value">
@@ -309,87 +316,102 @@
                separator=","
                clearable></el-cascader>
                            </el-form-item>
              -->
                        </el-form>
                    </el-col>
                </el-col>
                <!-- ä¸­é—´å¸ƒå±€ -->
                <el-col :span="7">
                    <el-form :label-position="labelPosition" :model="formData2" label-width="116px">
                        <el-form-item label="设备名称:">
                            <el-input v-model="formData2.deviceName" size="small"></el-input>
                        </el-form-item>
                        <el-form-item label="内部编码:">
                            <el-input v-model="formData2.internalCode" size="small"></el-input>
                        </el-form-item>
                        <el-form-item label="资产编码:">
                            <el-input v-model="formData2.assetCode" size="small"></el-input>
                        </el-form-item>
                        <el-form-item label="校准日期（月）:">
                            <el-date-picker v-model="formData2.calibrationDate" type="month" size="small" format="yyyy-MM"
                                value-format="yyyy-MM" style="width:100%" placeholder="选择月">
                    <el-form :label-position="labelPosition" :model="formData2" label-width="110px">
            <el-form-item label="生产厂家EN:">
              <el-input v-model="formData2.deviceName" size="small"></el-input>
            </el-form-item>
            <el-form-item label="出厂编号:">
              <el-input v-model="formData2.deviceName" size="small"></el-input>
            </el-form-item>
            <el-form-item label="管理编号:">
              <el-input v-model="formData2.deviceName" size="small"></el-input>
            </el-form-item>
            <el-form-item label="技术指标:">
              <el-input v-model="formData2.deviceName" :rows="7" type="textarea" size="small"></el-input>
            </el-form-item>
            <el-form-item label="购置日期:">
                            <el-date-picker style="width:100%" v-model="formData2.scrapTime" type="date"
                                format="yyyy-MM-dd" value-format="yyyy-MM-dd" size="small" placeholder="选择日期">
                            </el-date-picker>
                        </el-form-item>
                        <el-form-item label="报废时间:">
                            <el-date-picker style="width:100%" v-model="formData2.scrapTime" type="datetime"
                                format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" size="small" placeholder="选择时间">
            <el-form-item label="启用日期:">
                            <el-date-picker style="width:100%" v-model="formData2.scrapTime" type="date"
                                format="yyyy-MM-dd" value-format="yyyy-MM-dd" size="small" placeholder="选择日期">
                            </el-date-picker>
                        </el-form-item>
                        <el-form-item label="验收记录:">
                            <el-input v-model="formData2.acceptanceRecords" size="small"></el-input>
                        </el-form-item>
                        <el-form-item label="设备编码:">
                            <el-input v-model="formData2.factoryNo" size="small"></el-input>
                        </el-form-item>
                        <el-form-item label="购置日期:">
                            <el-date-picker style="width:100%" v-model="formData2.acquisitionDate" type="datetime" size="small"
                                format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期">
                            </el-date-picker>
                        </el-form-item>
                        <el-form-item label="准确度量值:">
                            <el-input v-model="formData2.accurateMeasurement" size="small"></el-input>
                        </el-form-item>
                        <el-form-item label="备注:">
                            <el-input v-model="formData2.notes" size="small"></el-input>
                        </el-form-item>
            <el-form-item label="管理人:">
              <el-select v-model="formData2.equipmentManager" placeholder="请选择" size="small" style="width:100%">
                <el-option v-for="item in responsiblePersonList" :key="item.value" :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
            </el-form-item>
            <el-form-item label="地址:">
              <el-input v-model="formData2.deviceName" size="small"></el-input>
            </el-form-item>
                    </el-form>
                </el-col>
                <!-- å³è¾¹å¸ƒå±€ -->
                <el-col :span="7">
                    <el-form :label-position="labelPosition" :model="formData2" label-width="110px" ref="ruleForm">
                        <el-form-item label="规格型号:">
                            <el-input v-model="formData2.specificationModel" size="small"></el-input>
                    <el-form :label-position="labelPosition" :model="formData2" label-width="120px" ref="ruleForm">
            <!-- å®žéªŒå®¤åˆ—表 -->
            <el-form-item label="所属部门:">
              <el-select v-model="formData2.equipmentManager" placeholder="请选择" size="small" style="width:100%">
                <el-option v-for="item in responsiblePersonList" :key="item.value" :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
            </el-form-item>
            <el-form-item label="检测项目:">
              <el-cascader
              v-model="formData.insProductIds"
              :options="options"
              :show-all-levels="false"
              :props="props"
              placeholder="请选择" size="small"
              style="width:100%"
              collapse-tags
              separator=","
              clearable></el-cascader>
            </el-form-item>
            <el-form-item label="校准服务机构:">
              <el-input v-model="formData2.deviceName" size="small"></el-input>
            </el-form-item>
            <el-form-item label="最近校准日期:">
                            <el-date-picker style="width:100%" v-model="formData2.latestTraceability" format="yyyy-MM-dd"
                                value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择日期">
                            </el-date-picker>
                        </el-form-item>
                        <el-form-item label="设备状态:">
            <el-form-item label="下次校准日期:">
                            <el-date-picker style="width:100%" v-model="formData2.latestTraceability" format="yyyy-MM-dd"
                                value-format="yyyy-MM-dd" type="date" size="small" placeholder="选择日期">
                            </el-date-picker>
                        </el-form-item>
            <el-form-item label="设备类型:">
              <el-select v-model="formData2.equipmentManager" placeholder="请选择" size="small" style="width:100%">
                <el-option v-for="item in equipmentList" :key="item.value" :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
            </el-form-item>
            <el-form-item label="单价(万元):">
              <el-input v-model="formData2.deviceName" size="small"></el-input>
            </el-form-item>
            <el-form-item label="当前状态:">
                            <el-select v-model="formData2.deviceStatus" placeholder="请选择" size="small" style="width:100%">
                                <el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
                                </el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item label="存放点:">
                            <el-input v-model="formData2.storagePoint" size="small"></el-input>
                        </el-form-item>
                        <el-form-item label="最近追溯日期:">
                            <el-date-picker style="width:100%" v-model="formData2.latestTraceability" format="yyyy-MM-dd HH:mm:ss"
                                value-format="yyyy-MM-dd HH:mm:ss" type="datetime" size="small" placeholder="选择日期">
                            </el-date-picker>
                        </el-form-item>
                        <el-form-item label="停用时间:">
                            <el-date-picker style="width:100%" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
                                v-model="formData2.downTime" type="datetime" size="small" placeholder="选择时间">
                            </el-date-picker>
                        </el-form-item>
                        <el-form-item label="维修记录:">
                            <el-input v-model="formData2.maintenanceRecords" size="small"></el-input>
                        </el-form-item>
                        <el-form-item label="生产厂家:">
                            <el-input v-model="formData2.manufacturer" size="small"></el-input>
                        </el-form-item>
                        <el-form-item label="采购费用:">
                            <el-input v-model="formData2.procurementCosts" size="small"></el-input>
                        </el-form-item>
                        <el-form-item label="校准证书:">
                            <el-input v-model="formData2.calibrationCerticate" size="small"></el-input>
                        </el-form-item>
            <el-form-item label="校准周期（月）:">
              <el-input v-model="formData2.deviceName" size="small"></el-input>
            </el-form-item>
                        <el-form-item label="图片:">
                            <div
                                style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;lineHeight:32px;display:flex;justify-content: space-around;font-size: 13px;">
@@ -434,7 +456,7 @@
                options: [],
                labelPosition: 'right',
                dialogVisible: false,
                dialogVisible2: false,
                dialogVisible2: true,
                addPower: false,
                componentData: {
                    entity: {
@@ -518,7 +540,7 @@
                responsiblePersonList: [],
                // æŽˆæƒäººåˆ—表
                authorizerList: [],
                // è®¾å¤‡çŠ¶æ€åˆ—表
                // å½“前状态列表
                deviceStatusList: [],
                upLoad: false,
                upLoad2: false,

 src/components/view/a6-device-overview.vue

@@ -151,8 +151,9 @@
                <el-button size="small" type="primary" @click="currentPage= 1,list=[],finishLoding = false,refreshTable()">查 è¯¢</el-button>
            </div>
        </div>
        <div class="table" @scroll="scrollFn">
      <ul v-loading="loading" class="card">
        <div class="table" v-loading="loading">
      <scroll-pagination @load="refreshTable" :finishLoding="finishLoding">
        <ul class="card">
        <li v-for="(m,i) in list" :key="i">
          <el-image class="img" :src="javaApi+'/img/'+m.imageUpload">
            <div slot="error" class="image-error" style="width: 112px;
@@ -192,27 +193,18 @@
          </div>
        </li>
      </ul>
      <div v-if="list.length<1&&!loading&&!isLoding" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >暂无数据</div>
      <div v-if="list.length>0">
        <el-button
          v-if="isLoding"
          type="text"
          style="display: flex; margin: 0 auto; color: #909399"
          ><i class="el-icon-loading" style="font-size:20px"></i
        ></el-button>
         <el-button
          type="text"
          v-if="finishLoding"
          style="display: flex; margin: 0 auto; color: #909399"
          >已经没有更多啦~</el-button
        >
      </div>
      </scroll-pagination>
      <div v-if="list.length<1&&!loading" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >暂无数据</div>
        </div>
    </div>
</template>

<script>
import ScrollPagination from '../tool/scroll-paging.vue'
    export default {
    components: {
      ScrollPagination
    },
        data() {
            return {
        entity:{
@@ -226,7 +218,6 @@
        pageSize: 16, // ä¸€é¡µ16条
        total: '',
        loading: true, // ç»„件loading的展示,默认为true
        isLoding: false, // åŠ è½½ä¸­ï¼Œloading图标,默认为true
        finishLoding: false // åŠ è½½å®Œæˆï¼Œæ˜¾ç¤ºå·²ç»æ²¡æœ‰æ›´å¤šäº†
            }
        },
@@ -238,13 +229,8 @@
    },
        methods: {
            refreshTable() {
        if(this.currentPage>1){
          this.isLoding = true
        }else{
        if(this.currentPage==1){
          this.loading = true
        }
        if(this.list.length==0){
          window.addEventListener("scroll", this.throttle(this.scrollFn, 20000));
        }
        this.$axios.post(this.$api.deviceScope.selectDeviceParameter,{
                    page: {
@@ -291,10 +277,10 @@
              if(this.total==this.list.length){
                this.finishLoding = true;
              }
              this.currentPage++;
            }
          }
          this.loading = false
          this.isLoding = false;
                })
            },
            refresh() {

 src/components/view/a6-personnel-overview.vue

@@ -46,7 +46,6 @@
  }
  .card li{
    width: 320px;
    /* height: 170px; */
    border-radius: 8px 8px 8px 8px;
    box-shadow: 4px 4px 8px 0px rgba(51,51,51,0.04);
    border: 1px solid #EEEEEE;
@@ -91,8 +90,9 @@
                <el-button size="small" type="primary" @click="currentPage= 1,list=[],finishLoding = false,refreshTable()">查 è¯¢</el-button>
            </div>
        </div>
        <div class="table" @scroll="scrollFn">
      <ul v-loading="loading" class="card">
        <div class="table" v-loading="loading">
      <scroll-pagination @load="refreshTable" :finishLoding="finishLoding">
        <ul class="card" style="margin-top: 10px;">
        <li v-for="(m,i) in list" :key="i">
          <el-image style="width: 80px;
            height: 112px;" :src="javaApi+'/img/'+m.pictureUrl">
@@ -119,27 +119,18 @@
          <div class="title">{{ m.name }}</div>
        </li>
      </ul>
      <div v-if="list.length<1&&!loading&&!isLoding" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >暂无数据</div>
      <div v-if="list.length>0">
        <el-button
          v-if="isLoding"
          type="text"
          style="display: flex; margin: 0 auto; color: #909399"
          ><i class="el-icon-loading" style="font-size:20px"></i
        ></el-button>
         <el-button
          type="text"
          v-if="finishLoding"
          style="display: flex; margin: 0 auto; color: #909399"
          >已经没有更多啦~</el-button
        >
      </div>
      </scroll-pagination>
      <div v-if="list.length<1&&!loading" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >暂无数据</div>
        </div>
    </div>
</template>

<script>
import ScrollPagination from '../tool/scroll-paging.vue'
    export default {
    components: {
      ScrollPagination
    },
        data() {
            return {
        entity:{
@@ -152,7 +143,6 @@
        pageSize: 16, // ä¸€é¡µ16条
        total: '',
        loading: true, // ç»„件loading的展示,默认为true
        isLoding: false, // åŠ è½½ä¸­ï¼Œloading图标,默认为true
        finishLoding: false // åŠ è½½å®Œæˆï¼Œæ˜¾ç¤ºå·²ç»æ²¡æœ‰æ›´å¤šäº†
            }
        },
@@ -163,13 +153,8 @@
    },
        methods: {
            refreshTable() {
        if(this.currentPage>1){
          this.isLoding = true
        }else{
        if(this.currentPage==1){
          this.loading = true
        }
        if(this.list.length==0){
          window.addEventListener("scroll", this.throttle(this.scrollFn, 20000));
        }
        this.$axios.post(this.$api.user.selectUserList,{
                    page: {
@@ -195,10 +180,10 @@
              if(this.total==this.list.length){
                this.finishLoding = true;
              }
              this.currentPage++;
            }
          }
          this.loading = false
          this.isLoding = false;
                })
            },
            refresh() {

 src/components/view/b1-report-preparation.vue

@@ -408,6 +408,7 @@
        let url = row.urlS?row.urlS:row.url;
        const link = document.createElement('a');
        link.href = this.javaApi + url;
        link.target = '_blank';
        document.body.appendChild(link);
        link.click();
      },
@@ -455,7 +456,7 @@
        this.$confirm('是否提交当前报告?', "提交", {
                            confirmButtonText: "提交",
                            cancelButtonText: "取消",
                            type: "success"
                            type: "warning"
                        }).then(() => {
                            this.$axios.post(this.$api.insReport.writeReport, {
                                id: row.id

 src/components/view/b4-daily-business-statistics.vue

@@ -161,7 +161,8 @@
        if (res.code == 201) return
        this.pageData = this.HaveJson(res.data)
        let xData = res.data.DAYS.map(m=>{
          return `${m[1]}-${m[2]}`
          let arr = m.split('-')
          return `${arr[1]}-${arr[2]}`
        })
        this.chartData0.xData = xData
        this.chartData1.xData = xData

 src/components/view/b4-inspection-item-statistics.vue

@@ -203,7 +203,8 @@
        if (res.code == 201) return
        this.pageData = this.HaveJson(res.data)
        let xData = res.data.DAYS.map(m=>{
          return `${m[1]}-${m[2]}`
          let arr = m.split('-')
          return `${arr[1]}-${arr[2]}`
        })
        this.chartData0.xData = xData
        this.chartData1.xData = xData

 src/components/view/b4-sample-defects.vue

@@ -57,12 +57,12 @@
            <div class="search_thing">
                <div class="search_label">检验项目：</div>
                <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                        v-model="entity.laboratoryName" @keyup.enter.native="refreshTable()"></el-input></div>
                        v-model="entity.inspectionItems" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing">
                <div class="search_label">委托编号：</div>
                <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                        v-model="entity.laboratoryNumber" @keyup.enter.native="refreshTable()"></el-input></div>
                        v-model="entity.orderNumber" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing" style="padding-left: 30px;">
                <el-button size="small" @click="refresh()">重 ç½®</el-button>
@@ -79,30 +79,30 @@
        default-expand-all
        :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
        <el-table-column
          prop="date"
          prop="inspection_item"
          label="检验项目"
          sortable
          min-width="180">
          <template slot-scope="scope">
            <p>
              <el-tag style="margin-right: 10px;height: 24px;border-radius: 10px;line-height: 24px;border: 0;" :type="scope.row.level==2?'success':''">{{ '0' + scope.row.level }}</el-tag>
              <span>{{ scope.row.date }}</span>
              <span>{{ scope.row.inspection_item }}</span>
            </p>
          </template>
        </el-table-column>
        <el-table-column
          prop="name"
          prop="entrust_code"
          label="委托编号"
          sortable
          min-width="180">
        </el-table-column>
        <el-table-column
          prop="address"
          prop="name"
          label="检验人"
          min-width="180">
        </el-table-column>
        <el-table-column
          prop="address"
          prop="create_time"
          label="检验时间"
          min-width="180">
        </el-table-column>
@@ -121,27 +121,11 @@
    export default {
        data() {
            return {
                entity: {},
        tableData: [{
          id: 3,
          date: '2016-05-01',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1519 å¼„',
          level:1,
          children: [{
              id: 31,
              date: '2016-05-01',
              name: '王小虎',
              address: '上海市普陀区金沙江路 1519 å¼„',
              level:2,
            }, {
              id: 32,
              date: '2016-05-01',
              name: '王小虎',
              address: '上海市普陀区金沙江路 1519 å¼„',
              level:2,
          }]
        }],
                entity: {
          orderNumber:null,
          inspectionItems:null,
        },
        tableData: [],
        page:{
          current:1,
          size:20,
@@ -151,15 +135,39 @@
            }
        },
        mounted() {

            this.getPower()
            // this.getPower()
      this.refreshTable()
        },
        methods: {
      refreshTable(){
        this.loading = true
        this.$axios.post(this.$api.insOrder.selectSampleDefects, {
                    ...this.page,
                    ...this.entity
                }).then(res => {
          this.loading = false
                    if (res.code === 201) {
                        this.loading = false
                        return
                    }
          this.total = res.data.total;
          this.tableData = res.data.records.map(item=>{
            item.level = 1;
            item.inspection_item = item.sample
            item.children = item.children.map(m=>{
              m.id = Math.random(10000)
              m.level = 2;
              return m
            })
            return item
          });
        })
      },
      refresh(){
        this.page.size = 20;
        this.entity = {
          orderNumber:null,
          inspectionItems:null,
        },
        this.page.current = 1;
        this.refreshTable();
      },

 src/components/view/index-index.vue

@@ -350,20 +350,26 @@
        </div>
        <div class="right-3 card" style="overflow: hidden;">
          <div class="right-3-tab">
            <div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==0}" @click="currentIndex=0">预警提醒 10</div>
            <div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==1}" @click="currentIndex=1">通知通告 12</div>
            <div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==4}" @click="currentIndex=4">预警提醒</div>
            <div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==5}" @click="currentIndex=5">通知通告</div>
          </div>
          <div class="right-3-list">
            <div class="list3-item" v-for="(m,i) in 5" :key="i">
          <div class="right-3-list" v-loading="listLoading">
            <scroll-pagination @load="getList" :finishLoding="finishLoding">
              <div class="list3-item" v-for="(m,i) in list" :key="i">
              <div class="list3-item-title">
                <img src="../../../static/img/index-tip.svg" alt="">
                <p>设备到期提醒</p>
                <p>{{ m.theme }}</p>
              </div>
              <div class="list3-item-info">
                <p style="width: 73%;-webkit-line-clamp: 1;" class="ellipsis-multiline">编号<span style="color:#3A7BFA;"> SB20240101-001 </span>的设备将于2023-09-09 11:11:11过期</p>
                <p>2023-09-09 09:09:09</p>
                <p style="width: 73%;-webkit-line-clamp: 1;" class="ellipsis-multiline">
                  <!-- ç¼–号<span style="color:#3A7BFA;"> SB20240101-001 </span>的设备将于2023-09-09 11:11:11过期 -->
                  {{ m.content }}
                </p>
                <p>{{ m.createTime }}</p>
              </div>
            </div>
            </scroll-pagination>
            <div v-if="list.length<1&&!listLoading" style="color:#909399;font-size:14px;text-align: center;margin-top:80px" >暂无数据</div>
          </div>
        </div>
      </el-col>
@@ -405,13 +411,17 @@
  import {
        getYearAndMonthAndDays
    } from '../../util/date'
  import ScrollPagination from '../tool/scroll-paging.vue'
    export default {
    components: {
      ScrollPagination
    },
        data() {
            return {
                user: {},
                now: null,
        calendarValue: new Date(),
        currentIndex:0,
        currentIndex:4,
        dialogVisible:false,
        query:{
          time:'',
@@ -424,11 +434,22 @@
        weekdays:[],
        listScheduleByMe:[],
        scheduleLoading:false,
        list:[],
        currentPage:1,
        pageSize: 8, // ä¸€é¡µ7条
        total: null,
        listLoading: true, // ç»„件loading的展示,默认为true
        finishLoding: false // åŠ è½½å®Œæˆï¼Œæ˜¾ç¤ºå·²ç»æ²¡æœ‰æ›´å¤šäº†
            }
        },
    watch:{
      calendarValue(val){
        this.getScheduleByMe()
      },
      currentIndex(){
        this.currentPage = 1;
        this.list = [];
        this.getList();
      }
    },
        mounted() {
@@ -440,8 +461,39 @@
      this.init();
      this.weekdays = this.getWeekdaysForNextWeek()
      this.getScheduleByMe()
      this.currentPage = 1;
      this.list = [];
      this.getList();
        },
        methods: {
      getList(){
        if(this.currentPage==1){
          this.listLoading = true
        }
        if(this.list.length==0){
          this.finishLoding = false;
        }
        this.$axios.get(this.$api.informationNotification.page+'?size='+this.pageSize+'&current='+this.currentPage+'&messageType='+this.currentIndex).then(res => {
          if(res.code === 201){
            return
          }
          let list = res.data.records;
          this.total = res.data.total;
          if(list.length==0){
            this.finishLoding = true;
          }else{
            if(list.length<this.pageSize){
              this.finishLoding = true;
            }
            this.list = this.list.concat(list)
            if(this.total==this.list.length){
              this.finishLoding = true;
            }
            this.currentPage++;
          }
          this.listLoading = false
        })
      },
            nowTime() {
                var date = new Date();
                var y = date.getFullYear();
@@ -562,7 +614,8 @@
            this.workList.push(res.data[`work${i}`])
          }
          this.workDay = res.data.weekDays.map(m=>{
            return m[2]
            let arr = m.split('-')
            return arr[2]
          })
        })
      },
@@ -624,6 +677,6 @@
          })
        })
      },
        }
        },
    }
</script>

 src/components/view/notice-detail.vue

@@ -1,22 +1,22 @@
<template>
  <div class="notice-detail-page">
    <div class="notice-detail-head">
      <h4 style="margin-bottom: 16px;">消息主题</h4>
      <h4 style="margin-bottom: 16px;">{{ noticeInfo.theme }}</h4>
      <p style="font-size: 12px;color: #999;margin-bottom: 20px;">
        <!-- <span>消息类型：审批&nbsp; </span> -->
        <span>发送人：111 </span>
        <span>发送人：{{ noticeInfo.createUser }} </span>
        <span>&nbsp;&nbsp;</span>
        <span>收件人：111</span>
        <span>收件人：{{ noticeInfo.consigneeUser }}</span>
        <span>&nbsp;&nbsp;</span>
        <span>发件时间：111</span>
        <span>发件时间：{{ noticeInfo.createTime }}</span>
      </p>
      <div class="notice-detail-head-content">
        <label>内容：</label>
        <div></div>
        <div>{{ noticeInfo.content }}</div>
      </div>
    </div>
    <div class="info-box">
      <component class="notice-content" :is="noticeInfo.u" style="height: 500px;">
    <div class="info-box" v-if="noticeInfo.jumpPath">
      <component class="notice-content" :is="noticeInfo.jumpPath" style="height: 500px;" >
          </component>
    </div>
  </div>
@@ -37,11 +37,19 @@
  components: comObj,
  data() {
    return{
      noticeInfo:{
        u:'b1-report-preparation'
      },
      noticeInfo:{},
    }
  }
  },
  created(){
    this.noticeInfo = JSON.parse(sessionStorage.getItem("noticeInfo"));
  },
  mounted(){
    this.noticeInfo = JSON.parse(sessionStorage.getItem("noticeInfo"));
    this.$bus.$on("change", (msg) => {
      this.noticeInfo = JSON.parse(msg);
      sessionStorage.setItem("noticeInfo", msg);
    });
  },
}
</script>


 src/main.js

@@ -130,5 +130,9 @@
new Vue({
    el: '#app',
    router,
    render: h => h(App)
    render: h => h(App),
  beforeCreate() {
      // éœ€è¦åœ¨å…¨å±€æ·»åŠ ä¸€ä¸ªå±žæ€§
    Vue.prototype.$bus = this
  }
});

 src/view/index.vue

@@ -463,7 +463,7 @@
      this.timer&&clearInterval(this.timer);
      this.timer = setInterval(()=>{
        this.checkForUnreadData()
      },10000)
      },20000)
        },
        methods: {
            saveClick(){

 src/view/notice.vue

@@ -33,74 +33,64 @@
        </el-dropdown-menu>
      </el-dropdown>
    </div>
    <div class="notice-content" @scroll="scrollFn" v-loading="loading">
      <div class="notice-content-item" v-for="(m,i) in list" :key="i">
        <div class="btns" v-if="m">
          <el-dropdown style="margin-right: 20px;" trigger="click" @command="e=>handleDropdown(e,m)" v-if="m.messageType==2||m.messageType==3">
            <span class="el-dropdown-link">
              <span class="more" style="line-height: 26px;display: inline-block;">&middot;&middot;&middot;</span>
            </span>
            <el-dropdown-menu slot="dropdown" v-if="m.messageType==2">
              <el-dropdown-item v-for="(n,j) in dropdownList0" :key="j" :command="n.value">
                {{ n.label }}
              </el-dropdown-item>
            </el-dropdown-menu>
            <el-dropdown-menu slot="dropdown" v-if="m.messageType==3">
              <el-dropdown-item v-for="(n,j) in dropdownList1" :key="j" :command="n.value">
                {{ n.label }}
              </el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
          <i class="el-icon-close" style="cursor: pointer;" @click="handleDel(m)"></i>
        </div>
        <div class="content">
          <img :src="`../../static/img/notice-${m.messageType}.svg`" alt="" style="width: 50px;margin-right: 18px;">
          <div class="content-info">
            <h4 style="font-weight: normal;margin-bottom: 4px;display: flex;align-items: center;justify-content: space-between;">
              <span>{{ m.theme }}<el-tag :type="!m.messageStatus?'danger':'success'" size="small" v-if="m.messageType==1||m.messageType==2||m.messageType==3" style="margin-left: 8px;">{{ !m.messageStatus?'未处理':'已处理' }}</el-tag></span>
              <span class="time" style="color: #999999;font-size: 12px;">{{ m.createTime }}</span>
            </h4>
            <p style="color: #999999;font-size: 14px;margin-bottom: 6px;cursor: pointer;" class="ellipsis-multiline" @click="goNoticeDetail(m)">{{ m.content }}</p>
            <p style="font-size: 12px;color: #999999;display: flex;align-items: center;justify-content: space-between;">
              <span>发送人：{{m.createUser}}</span>
              <span>收件人：{{ m.consigneeUser }}</span>
            </p>
    <div class="notice-content" v-loading="loading">
      <scroll-pagination @load="refresh" :finishLoding="finishLoding">
        <div class="notice-content-item" v-for="(m,i) in list" :key="i">
          <div class="btns" v-if="m">
            <el-dropdown style="margin-right: 20px;" trigger="click" @command="e=>handleDropdown(e,m)" v-if="m.messageType==2||m.messageType==3">
              <span class="el-dropdown-link">
                <span class="more" style="line-height: 26px;display: inline-block;">&middot;&middot;&middot;</span>
              </span>
              <el-dropdown-menu slot="dropdown" v-if="m.messageType==2">
                <el-dropdown-item v-for="(n,j) in dropdownList0" :key="j" :command="n.value">
                  {{ n.label }}
                </el-dropdown-item>
              </el-dropdown-menu>
              <el-dropdown-menu slot="dropdown" v-if="m.messageType==3">
                <el-dropdown-item v-for="(n,j) in dropdownList1" :key="j" :command="n.value">
                  {{ n.label }}
                </el-dropdown-item>
              </el-dropdown-menu>
            </el-dropdown>
            <i class="el-icon-close" style="cursor: pointer;" @click="handleDel(m)"></i>
          </div>
          <div class="content">
            <img :src="`../../static/img/notice-${m.messageType}.svg`" alt="" style="width: 50px;margin-right: 18px;">
            <div class="content-info">
              <h4 style="font-weight: normal;margin-bottom: 4px;display: flex;align-items: center;justify-content: space-between;">
                <span>{{ m.theme }}<el-tag :type="!m.messageStatus?'danger':'success'" size="small" v-if="m.messageType==1||m.messageType==2||m.messageType==3" style="margin-left: 8px;">{{ !m.messageStatus?'未处理':'已处理' }}</el-tag></span>
                <span class="time" style="color: #999999;font-size: 12px;">{{ m.createTime }}</span>
              </h4>
              <p style="color: #999999;font-size: 14px;margin-bottom: 6px;cursor: pointer;" class="ellipsis-multiline" @click="goNoticeDetail(m)">{{ m.content }}</p>
              <p style="font-size: 12px;color: #999999;display: flex;align-items: center;justify-content: space-between;">
                <span>发送人：{{m.createUser}}</span>
                <span>收件人：{{ m.consigneeUser }}</span>
              </p>
            </div>
          </div>
          <div class="new-notice" v-if="!m.viewStatus">
            <span>new</span>
          </div>
        </div>
        <div class="new-notice" v-if="!m.viewStatus">
          <span>new</span>
        </div>
      </div>
      <div v-if="list.length<1&&!loading&&!isLoding" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >暂无数据</div>
      <div v-if="list.length>0">
        <el-button
          v-if="isLoding"
          type="text"
          style="display: flex; margin: 0 auto; color: #909399"
          ><i class="el-icon-loading" style="font-size:20px"></i
        ></el-button>
         <el-button
          type="text"
          v-if="finishLoding"
          style="display: flex; margin: 0 auto; color: #909399"
          >已经没有更多啦~</el-button
        >
      </div>
      </scroll-pagination>
      <div v-if="list.length<1&&!loading" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >暂无数据</div>
    </div>
  </el-drawer>
</div>
</template>

<script>

import ScrollPagination from '../components/tool/scroll-paging.vue'
export default {
  components: {
    ScrollPagination
  },
  data(){
    return{
      drawer:false,
      direction:'rtl',
      options:[],
      type:'0',
      list:[],
      dropdownList0:[
        {
          label:'通过',
@@ -129,11 +119,11 @@
          value:4
        },
      ],
      list:[],
      currentPage:1,
      pageSize: 16, // ä¸€é¡µ16条
      pageSize: 8, // ä¸€é¡µ7条
      total: null,
      loading: false, // ç»„件loading的展示,默认为true
      isLoding: false, // åŠ è½½ä¸­ï¼Œloading图标,默认为true
      loading: true, // ç»„件loading的展示,默认为true
      finishLoding: false // åŠ è½½å®Œæˆï¼Œæ˜¾ç¤ºå·²ç»æ²¡æœ‰æ›´å¤šäº†
    }
  },
@@ -145,13 +135,11 @@
  },
  methods:{
    refresh(){
      if(this.currentPage>1){
        this.isLoding = true
      }else{
      if(this.currentPage==1){
        this.loading = true
      }
      if(this.list.length==0){
        window.addEventListener("scroll", this.throttle(this.scrollFn, 20000));
        this.finishLoding = false
      }
      let type = this.type==0?null:this.type;
      this.$axios.get(this.$api.informationNotification.page+'?size='+this.pageSize+'&current='+this.currentPage+(type?'&messageType='+type:'')).then(res => {
@@ -170,9 +158,9 @@
          if(this.total==this.list.length){
            this.finishLoding = true;
          }
          this.currentPage++
        }
        this.loading = false
        this.isLoding = false;
      })
    },
    open(){
@@ -192,6 +180,8 @@
    goNoticeDetail(row){
      this.$axios.put(this.$api.informationNotification.triggerModificationStatusToRead+'/'+row.id).then(res => {
        this.drawer = false;
        row.num = Math.random(100);
        this.$bus.$emit("change", JSON.stringify(row));
        this.$parent.addTab({
          v: "消息详情",
          i: "el-icon-s-tools",